commit | 80db3afc271099f9b1cc5af4bb2ad15f1119a8ab | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:50:16 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:50:16 2012 -0700 |
tree | ed992e44215d76d5a240c51809e207c0bf8c3385 | |
parent | c1e3949ccc2bada98a5c15cc39102a832e1c1691 [diff] | |
parent | 291c67061635013c1356e815b3e6f1c0913bae54 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I8db6a15cd7ad3b23c45c455640c3910d7f3fc240