tree ef3eadabdd66dd30392c9a451410c5ad3950294c
parent fb41cd524ad144b9c5b8de74d557249a49723b21
parent d612ec14226d082d246d8448637d15888733a8b9
author The Android Open Source Project <initial-contribution@android.com> 1349968106 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349968106 -0700

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

* commit 'd612ec14226d082d246d8448637d15888733a8b9':