| commit | 31b161cedce884cb7a1426f810d4e1cba9d33f46 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 11 14:56:39 2013 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Jun 11 14:56:40 2013 -0700 |
| tree | 18edaa92da53733b027bb753a10cdaa472e98e07 | |
| parent | 6345230095ac4ac7eb45c71caccd5a4b02942a8e [diff] | |
| parent | b6a48228f9738dd9c11f3584853e31caeedc45ab [diff] |
Reconcile with jb-mr2-zeroday-release - do not merge Change-Id: I40a07d0eebc9a1ff517241b9788f30c047a62692