| commit | 6760cfd1a6d3982664275ae02835a3dd72b30cac | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:37:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:37:11 2013 -0700 |
| tree | 6485364758416639bcbfc8c74c7db2f25234b3ae | |
| parent | 9046684244e6adaf4db46f1a5e5b1fea221cd781 [diff] | |
| parent | 291967728b02ad9a7d5545b0eb1ec0c4c3d664af [diff] |
am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '291967728b02ad9a7d5545b0eb1ec0c4c3d664af':