tree bebef3e8b8d9ef0842d6591508d78f58300dd5bb
parent abb3d697c872dbc29ce5cfa376369e724c7e362c
parent 8a7d620aa0ad7bada6f50b757d1bc328db1fe257
author The Android Open Source Project <initial-contribution@android.com> 1343771574 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343771574 -0700

am 8a7d620a: am 4124016a: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '8a7d620aa0ad7bada6f50b757d1bc328db1fe257':