OSDN Git Service

am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:41:47 +0000 (12:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:47 +0000 (12:41 -0700)
commit0a6fba48af31916208a20b2bf142ac7dea0a014a
tree429519b3bd4fbc7f47ee2be82f2778ef1545fbdd
parentef5abc369823f634c460c8f24d3cbf310542fe3b
parentca53acd700fb14a863d4b84f976698de0fc82af8
am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':