commit | f7e3bf10d1cd8f6fb9c27554cee49236e2a60604 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 14:08:52 2012 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 14:08:52 2012 -0800 |
tree | d2a31097a10f5831cc5aeb67d01603e69b08e9ef | |
parent | bf91b83741e5a0a2dd8a77258f15681cbd3d1d3f [diff] | |
parent | 619da12de3e62396aa116e19411e69c200ababb9 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I12d4a58d07acfa901dddda62f7df767de3bd27af