tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent eb754fc01b4e1f1a664ddbe375d56f624a053d19
parent 7e0bd69e3f230f53b60bc89d25acf6c06c920384
author Jean-Baptiste Queru <jbq@google.com> 1361918046 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361918046 -0800

am 7e0bd69e: am 12b61826: am 61ea9d98: Reconcile with jb-mr1-release - do not merge

* commit '7e0bd69e3f230f53b60bc89d25acf6c06c920384':