tree f7d2a206b03920b6c819925f52a99afd80a2b9ab
parent b17443674f6c5fe12f9658ceb40e357f2b5bbf2d
parent 1954242cb27c68ef311abb3fa12c607145a10d7b
author Jean-Baptiste Queru <jbq@google.com> 1363032814 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032814 -0700

am 1954242c: am 83e25988: (-s ours) am 294cefd4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1954242cb27c68ef311abb3fa12c607145a10d7b':