OSDN Git Service

am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:42:00 +0000 (12:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:42:00 +0000 (12:42 -0700)
commit93bb0058bd3e5c0703797289f88a033789249766
tree257e3dcf4801f649618a44c453253c016d953903
parenta7c17deb32fe28230b77b0dff17bb113088a5c16
parent4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad
am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad':