tree 46a082fb0ccd3e2f74c2f0ce3588e13803406fdb
parent fb8d0e9a6f5a85c737ecedd42b850d2c41181a6a
parent dd6165c7e53c3a6b48a53f8c3f1d518cb631111d
author The Android Open Source Project <initial-contribution@android.com> 1352233369 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233369 -0800

am dd6165c7: am 2b60db0e: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'dd6165c7e53c3a6b48a53f8c3f1d518cb631111d':