tree 43a79683c8015d1eaf8eaca7170f91fe5f30eb45
parent 3d5b5db3f60a50026bf74f3b01607562c3f764e8
parent b2734edb5022d69bec22b249f09aabe3f9215a50
author The Android Open Source Project <initial-contribution@android.com> 1352233627 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233627 -0800

am b2734edb: am 779f058c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'b2734edb5022d69bec22b249f09aabe3f9215a50':