| commit | 25c60793a032f589757fb8d8ebc1e9c69f465233 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:40 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 15:40:40 2012 -0800 |
| tree | cf74e75c23a7a719581337b984ec0cd3801c3619 | |
| parent | a4db50872378baf84a367436c4d369db30767ed6 [diff] | |
| parent | 22f52c599d5172b0ad2e18d9e91ca58ea5a5e736 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: Ia472ba06a35566362ed8cbe9bab1bd301cf32ca6