tree 1accede5e43bb6ad38058079de2f839ad5bd22f3
parent 917e120f736f95292a40b6c7da9940d6369955e1
parent 803b245ef485f16245234a42b8885a2ec50c5e5a
author Jean-Baptiste Queru <jbq@google.com> 1363031235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363031235 -0700

am 803b245e: (-s ours) am 469dbc0a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '803b245ef485f16245234a42b8885a2ec50c5e5a':