commit | b78ced24c6da9d80a4d94017bdf8493dcb3f1f4b | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:50:22 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Oct 04 07:50:22 2012 -0700 |
tree | 68bb55a4ef05616297b67bd3ab555059bfe0eff8 | |
parent | e17c821e36163695f6d5024a71f8e706bda65fd6 [diff] | |
parent | 6800ae9fd3b4b2470e061725c66e2bab3c54d62f [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ic30692b569b80fb34ed2d2960007f76b01e0c398