| commit | fd9bf2e08d6ddfa3b93fc007f9eb8804ccbe4983 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Mar 31 13:22:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 31 13:22:23 2014 +0000 |
| tree | 5a6ee5928fe7b9befc7a297a3b48195b0f7715ba | |
| parent | 3926d3223346adbb2054c2dfb52f4b1f6b8076ec [diff] | |
| parent | 439cf5b433123970a94388cf9309d9ea4d31b3cb [diff] |
am 439cf5b4: am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp * commit '439cf5b433123970a94388cf9309d9ea4d31b3cb': Don't make isSafeMode a field on the Zygote class.