commit | e22c8b7ec78c3c5ed0a42e331378c0ffc15d5c42 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:36:26 2013 -0800 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Feb 05 13:36:26 2013 -0800 |
tree | 33a049c3d706dbd079cbc4ff78d0a50be75fb833 | |
parent | dc845f281d57f6bceeba12e770bfdddf964ae7e5 [diff] | |
parent | 0f6f04f695b20f5f1c691450b47253fc38ea7b31 [diff] |
Reconcile with jb-mr1.1-release - do not merge Change-Id: I0ef140d90408b238a766c8f524ebda617ffa5edd