git: openjdk/mobile: 8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp

[duke]

Changeset: 03c3f174
Author:    Daniel D. Daugherty <dcubed at openjdk.org>
Date:      2019-12-18 18:22:52 +0000
URL:       https://git.openjdk.java.net/mobile/commit/03c3f174

8236226: fix merge error in src/hotspot/share/gc/z/zRootsIterator.cpp

Reviewed-by: dholmes, kbarrett

! src/hotspot/share/gc/z/zRootsIterator.cpp