commit | f6b165e0232c315d91c3ba2c394da27234012fd9 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:26:09 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:26:09 2012 -0700 |
tree | 6eefbe035018d93ecbe709366b5c561fcd1c2b32 | |
parent | 63776ca7d9c1014b629b382cc7126d2a6802ee6f [diff] | |
parent | 709f96221f2147089fc6ebbb23bd8689bd298fdc [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: If85f28cdbccda3f78297d611fb01a38ee310e208