commit | c05c993c9d11a183c5af24257cd5b4c4b1661706 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:35:20 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Sep 20 10:35:20 2012 -0700 |
tree | 8d78ebadb9c33191a0490537dbd50da4e6c85b49 | |
parent | 4b85fbee6fafae65a1d7122555ab8bc68fc20405 [diff] | |
parent | 9898a9361c1eb7d2f934b195183157c237ec9bd2 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Id03db4a4500f1e58a7ebc8cff60d46538579e8ab