| commit | 1f5799d52712d3d896079e439ae73b7599e17308 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:34:23 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:34:23 2013 -0700 |
| tree | 326c5f0b751931ea2d6a42cef980a126754a5b2e | |
| parent | 74db1f3409b8debd61afdd17a0b0884803f28d7e [diff] | |
| parent | e3f5df60ce35333a7df23f726905f4bb328abc8f [diff] |
am e3f5df60: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'e3f5df60ce35333a7df23f726905f4bb328abc8f':