tree d3c0a3d8e2de7a145bb5d826844596b2b514ac1e
parent 12928a07c5c19ac3dea6d0489506595c138b621a
parent f4a7ac00a734343b8d2760def352cbdf99fa08c7
author Elliott Hughes <enh@google.com> 1398738694 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398738694 +0000

am f4a7ac00: Merge "Move the Zygote off libcore.os and onto android.system."

* commit 'f4a7ac00a734343b8d2760def352cbdf99fa08c7':
  Move the Zygote off libcore.os and onto android.system.