tree 429519b3bd4fbc7f47ee2be82f2778ef1545fbdd
parent ef5abc369823f634c460c8f24d3cbf310542fe3b
parent ca53acd700fb14a863d4b84f976698de0fc82af8
author Jean-Baptiste Queru <jbq@google.com> 1363030907 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030907 -0700

am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':