tree 6498d56e54e009f80a5bfadf53c93d2b1a394644
parent 697bdc604e8f266ebd6c94fc84eb5057b1a700e3
parent 5da2dbbc935356f526cdfb0b522b332fc8b95fc7
author Narayan Kamath <narayan@google.com> 1396369599 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396369599 +0000

am 5da2dbbc: Merge "Move zygote init config to its own file."

* commit '5da2dbbc935356f526cdfb0b522b332fc8b95fc7':
  Move zygote init config to its own file.