| commit | ac0fd124133b04f555047df8804ecc46ef3751e9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:46:28 2012 -0800 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Thu Dec 20 15:46:28 2012 -0800 |
| tree | 8c68eb119c07b70230abbcf81af63998adca998f | |
| parent | 5ddfa24776f971d45e5fc80189abb3edd715818d [diff] | |
| parent | 345f7fcfaf86ece0fa346f1b20577b0b63a84c06 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I47c257db0d5a21fe4f6592924ebd47bd8578d5ea