tree cf4f33a9eb00bcb96381143e77e128768ed96ae4
parent 0e9530291ab64a7e788047110650844539bc7e95
parent ee76e18125438183d7e7bfa5e2b10172fcf565ec
author The Android Open Source Project <initial-contribution@android.com> 1354124975 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354124975 -0800

am ee76e181: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'ee76e18125438183d7e7bfa5e2b10172fcf565ec':