tree 1285ffe30aa976f7bb8abde83214689e2049a4e2
parent 5d5f19a339bc4a8f10f75b51625d8d50ee0729e0
parent be3dc5754fd081f54a86df9894763c0da915eed3
author Narayan Kamath <narayan@google.com> 1400161272 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400161272 +0000

am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."

* commit 'be3dc5754fd081f54a86df9894763c0da915eed3':
  Wait for secondary zygote before bringing up the system_server.