tree 453e880c395e56ed680ec254ca40fcd4f97a3db5
parent a1f14e09123de97155d5b6a41ae10effa60f74ce
parent 6b7e35d216142a20bcd5c2e4984f27255c54e5a6
author Christian Wailes <chriswailes@google.com> 1548296926 -0800
committer android-build-merger <android-build-merger@google.com> 1548296926 -0800

Merge "Code cleanup in ZygoteInit." am: 889648df40
am: 6b7e35d216

Change-Id: I654fcdb478dfae98d78b0353e068122d115dd2c5