OSDN Git Service

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

* commit 'b25a2fcfae02ff802b81978ec82f0da8d2735d77':