| commit | af4324cc0ad6fb4d4a7716ebff2421424c4a2292 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:48:28 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:48:28 2012 -0700 |
| tree | 1006b8b14ccb70b77173f4ba53c53051bcddc8e0 | |
| parent | 2526675e907dd9b3d224760a87185c017f66a796 [diff] | |
| parent | 5031729a37b510959244e076bb1c4b06e1095f74 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I4e8f1a58de984fa0945b9df9e8bc230c11e7fc58