| commit | 5c0dd380d0e2342271b83d1f57ac730b1a0de4af | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:52:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:52:24 2013 -0700 |
| tree | e330e687ec5fa3884bdcb19ba87af33e4b5548cd | |
| parent | 013df9a0a7dd1e7177c4030824d42c5ae89b7d11 [diff] | |
| parent | 29dd8449e6d3ee34e229e8efdb1024c20e2cddd2 [diff] |
am 29dd8449: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '29dd8449e6d3ee34e229e8efdb1024c20e2cddd2':