Narayan Kamath 439cf5b433 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.

2014-03-31 13:16:16 +00:00

..

java/com/android/server

…

jni

…

Android.mk

…