| commit | b07178467f604057d4e931df32f2f7f0e53d542a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Apr 02 10:59:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 02 10:59:18 2014 +0000 |
| tree | 6e182d5e35d285b8aba4f0c9460bfb0e679bda3f | |
| parent | f976f8e55188df489eebe7f00b157bd992f8c106 [diff] | |
| parent | b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a [diff] |
am b69bb445: resolved conflicts for merge of 71ab4f4f to master * commit 'b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a': Move zygote startup logic to the frameworks.