tree 13c85d682902107a6152f4dfdc5f7d0cd7d01db0
parent 546bec8ebf2cf865e88d02cc8cb29563ad224967
parent 56a8f8b48ff1d0855209307b9076d6e9b348b59b
author Narayan Kamath <narayan@google.com> 1396271776 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396271776 +0000

am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp

* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
  Don't make isSafeMode a field on the Zygote class.