OSDN Git Service

am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:42 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:42 +0000 (13:00 -0700)
commit0b904fdaa636372e9173f1fb4a5dae5c382aabb8
tree257e3dcf4801f649618a44c453253c016d953903
parent85f8faa65754011161f40b2047fa19a6128ba88c
parent93bb0058bd3e5c0703797289f88a033789249766
am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '93bb0058bd3e5c0703797289f88a033789249766':