commit | f6451116423c6195a464b69b6e07aa8ef743e6b1 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 22 13:42:53 2013 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Fri Feb 22 13:42:53 2013 -0800 |
tree | 1c5affe501918406fae744bdf830afc270723aed | |
parent | c5ce4108facc5a1b94fcf9469a189b2cbdfd5e76 [diff] | |
parent | 7d5f33ed55b9511a64d3e73b33366718972f74af [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie31a50f2edd4ef863f56f8939fcf8e806fb2ba0a