OSDN Git Service

am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:27 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:27 +0000 (13:00 -0700)
commit0fe40641db3759088edc1bc7f0182556d77bede6
treeeaa823a6a891e4669eefe9aab966fe59a4783429
parent9b7e8fc7c564b24a1c099dddae4e9c1126bd7c4e
parent72c7cf9d13f5a51a71dccc6d94317727bd0feec3
am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '72c7cf9d13f5a51a71dccc6d94317727bd0feec3':