OSDN Git Service

am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:28:32 +0000 (12:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:28:32 +0000 (12:28 -0700)
commit5c8f84a15fba998baf9703c81e86a25048ce368a
tree666c555c513847cfafffb006cd7ae40c9271db84
parent48697f6dc249d1238243677de77d3a0eb6a17b3f
parent3a18bcccb201b37e5b0cdff76febafb214cb8b90
am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '3a18bcccb201b37e5b0cdff76febafb214cb8b90':