OSDN Git Service

Merge changes Id931d441,I83faf974
authorNarayan Kamath <narayan@google.com>
Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)
commit66d7275d393209bea48711df633b023d987652bb
tree8c82ea092472e89cd3dc1633b55c82bdd16e231d
parentf0a3c209ea0f6b36d18ede70e0e60758517b8116
parent89c94f67b4822a52ac9ddf44ce11fa46eac28b74
Merge changes Id931d441,I83faf974
am: 89c94f67b4

Change-Id: Ifc090e141092bcee11704e45d6f97f642040d002
core/java/com/android/internal/os/Zygote.java
core/java/com/android/internal/os/ZygoteInit.java