| commit | 8f7ac8caa62326d28a50c9aeb037a805eda661f1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:46:18 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:46:18 2012 -0800 |
| tree | 886e43ddd1e8d50cf1476a252fc31458b8aaf7f8 | |
| parent | 97654bc68fe98ec443599b46fa0ad2c518fa4875 [diff] | |
| parent | 74bb088c75ed88e0059d4e75eecc6101d15f32f7 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I522981a273e1844811c7a53ca76c75a3e3365b77