OSDN Git Service

am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Wed, 27 Feb 2013 06:26:33 +0000 (06:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Feb 2013 06:26:33 +0000 (06:26 +0000)
commit84d3036cf9ee03e118b4cfa857d574e5d3684c98
treeb7c53bd53118cc6f5812d58e21941a06f4276dc0
parentbde267772d42cddf091ebcc2f18d95977ec6f9a5
parented9cc555ee69feb0a1b13caf29ffefa56cf51149
am ed9cc555: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'ed9cc555ee69feb0a1b13caf29ffefa56cf51149':