tree 7a6fcde317da44077cff3d763f6b2114549e34fa
parent d5c6a611066ef3bdc8f3729ea222338b3fc11390
parent 9155fe81a9844b78f90f340dad36c106768aae6b
author The Android Open Source Project <initial-contribution@android.com> 1350312176 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350312176 -0700

am 9155fe81: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '9155fe81a9844b78f90f340dad36c106768aae6b':