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

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

* commit '469dbc0aec2b85c3ac9947f1d1572c27bd5ce99e':