OSDN Git Service

am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:22:41 +0000 (12:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:22:41 +0000 (12:22 -0700)
commita4b20d712b9c6cbc562529d3a41bf8ea1515562a
tree259692b9abecd9c451413631c7b2ab83be7d16ee
parentf61e50201b7d5e793a479979c304d3388ca1405f
parentb8e1033c5b5813cb97d19645075591a357e9f04a
am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':