[automerger skipped] ro.zygote in base_system.mk is optional am: 8d521ec2c8
am: b4233d19e8
-s ours am: eb3e2fdf4b
-s ours
am skip reason: Change-Id Ia7a67c0a04fad343d6591417f40dd4b9ddadc5e4 with SHA-1 b00931e7eb
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1344822
Change-Id: I2e2975a4f173f59f6eb173f72ffa32db8bc47257
This commit is contained in: