tree ca12bff66cf7347fa38937f5aea088e2583bbac5
parent 04c2a5571620927f702af3707845b1b05769dc46
parent ea9e5ecac1e5240370f0e3f998b9c8b159ee9320
author Narayan Kamath <narayan@google.com> 1396435284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396435284 +0000

am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks."

* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
  Move zygote startup logic to the frameworks.