commit | 4d48e3e0543d99e53668a036d782a6fb42d2b6f6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:37:31 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:37:31 2012 -0700 |
tree | 2f2e349082a6684d40de13a5aa163d0c9ec7460a | |
parent | e1e9c7d87f1253f26e54383958319fd48f1fcc7e [diff] | |
parent | a8a3069a6f74e30acb70debefcac2d6f66707610 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17