commit | 3666f42b4574226d17566660ca0945ec30ee528a | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:27:30 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 11:27:30 2012 -0700 |
tree | 7bb46286f51ff0a1349577cc741940d21e918603 | |
parent | 6c465d9d26c7389357dedd4b71c6a95ccb6f019c [diff] | |
parent | d4afbf9b98fa04017f30afc2f273ce4ca49724df [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ia6cd9f9da1393801f6aeca58eafb6740bae275ca