tree 222727f52c0e1e8eee8d6f4bf14a028525537b44
parent 0e32dc9d01ddd075a58f5de56fd14d7de4675c49
parent a13898896c29cffd3ade8b795dbdb892ed1fa044
author Christian Wailes <chriswailes@google.com> 1548297881 -0800
committer android-build-merger <android-build-merger@google.com> 1548297881 -0800

[automerger skipped] Merge "Code cleanup in ZygoteInit." am: 889648df40 am: 6b7e35d216
am: a13898896c -s ours
am skip reason: change_id I0d348caa1d9ca2a4c1e32430e0eebdd91672e473 with SHA1 143f7cc78e is in history

Change-Id: I660cf1e2e818d62beece1db547926548baf35454