| commit | 2807c55363a97b9441f6c8dce9467a0539f74085 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 17:02:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 25 17:02:18 2013 -0700 |
| tree | 2cbfed376ec97c821a3b0a63e4c0cce69899b812 | |
| parent | 85661dc1d67319184a804a1e798397dda7fad18c [diff] | |
| parent | 86f04fe381688ca49fa69e8e59bb296d1f8f20a9 [diff] |
am 86f04fe3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '86f04fe381688ca49fa69e8e59bb296d1f8f20a9':