OSDN Git Service

am c5d9527e: am cc9002b1: am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:44:22 +0000 (13:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:44:22 +0000 (13:44 -0700)
commit5cb3ac0af7dc20299166992f1b5e462f8e9a83e2
treed936cbbed0e716729a6af940829e312e8cf9fa1d
parent315d38e9773af8d060045fe8611eab85597cbd3f
parentc5d9527ef9afcc59e700d3a4f0aa18831c2a9da0
am c5d9527e: am cc9002b1: am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'c5d9527ef9afcc59e700d3a4f0aa18831c2a9da0':