OSDN Git Service

am 484bdcab: am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:45 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:45 +0000 (13:44 -0700)
commit9a0ae9b77dd8d886faa93b7360277e09417ba11c
tree8325186b61b3bf89ab3f7a3ce4951434c4aa4d15
parentcfd1a58237c5fe84ddd30c9a73dd361697060aed
parent484bdcab1e7e64c2ad6ee36b9d216dbc94e82608
am 484bdcab: am 63790dce: am 42b4c508: (-s ours) am 11ff695d: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '484bdcab1e7e64c2ad6ee36b9d216dbc94e82608':