tree abd7a4e2008548f3dbb693c2065779e1593c67e1
parent 97bb5a9f987c40ea2ae82cfd7d46aec23735e998
parent e08bbe5b6d1d5db8f057c840773b435f869384cd
author The Android Open Source Project <initial-contribution@android.com> 1348679254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348679254 -0700

am e08bbe5b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'e08bbe5b6d1d5db8f057c840773b435f869384cd':