OSDN Git Service

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

* commit 'e5412a9a9597433ae2540b390269c514c46402f1':