tree f47b493465a36c919161eaae44361412a482d2ea
parent 05b0d848b890181e5782b39988a167eda7558554
parent ffca173c853a2e312610d87f40957f696ac8364a
author Narayan Kamath <narayan@google.com> 1396369797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396369797 +0000

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

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