| commit | 05caa74872df1258bbf4473fe6d222a9487fe051 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:51:57 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:51:57 2012 -0700 |
| tree | 94c792fecaf7231721305c1ace5a04fe2558536b | |
| parent | 6a52c12da5dfe279fa6fb4a0a02db49a0dfbc1de [diff] | |
| parent | 2888da87eb910648665fb3e16f6b389b808997eb [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44