| commit | 37f11e06f326c6fd0467b4fb7f4115babe86992e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 11 08:08:03 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 11 08:08:03 2013 -0700 |
| tree | 100982689c6f1858a1f23e975f2080904d565df4 | |
| parent | fd30db5f291e95038455495185e7af719d1911ac [diff] | |
| parent | 93351edefa033cade3c8f06729a1b2a73f70e18b [diff] |
am 93351ede: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '93351edefa033cade3c8f06729a1b2a73f70e18b': "JSS09"