| commit | 9faec6c700401ad4f76145b942abccc319600de9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 25 17:02:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 25 17:02:31 2013 -0700 |
| tree | aa525d2aa12f2b0ac1a49a2a53b4c8297d6a29ab | |
| parent | e10e90d084f601b1b21c57146416c3ccb9a139c1 [diff] | |
| parent | 400d63122f3a3e3ea1ef04474aeeaa99cf4baeca [diff] |
am 400d6312: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '400d63122f3a3e3ea1ef04474aeeaa99cf4baeca':