OSDN Git Service

am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:41:50 +0000 (12:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:50 +0000 (12:41 -0700)
commit75bcd737770f85114673c4411b8e2ecc0dd32bdf
treede4b9fce9ad3e87543de1a4335f9f1d3d97d426c
parentf53f9c6d3668490f6c68f5c094c28f645c1b3da3
parent4ddcb75861cfb2835fcc20f2071222d2f55450ba
am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4ddcb75861cfb2835fcc20f2071222d2f55450ba':