| commit | 906da769071179218f99c9c13e4415b6d47b6524 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 10:17:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 10:17:28 2013 -0700 |
| tree | f02f07ac02e0c35ab87f79ed4920af48b785b0b1 | |
| parent | 640f9a64557f51a413cbabc22bde941af6dff5b3 [diff] | |
| parent | 86d3acc0a7f9310c91c201f8341f3335c8d88b06 [diff] |
am 86d3acc0: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '86d3acc0a7f9310c91c201f8341f3335c8d88b06':