OSDN Git Service

am d7b3cc0c: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Aug 2012 22:09:18 +0000 (15:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 Aug 2012 22:09:18 +0000 (15:09 -0700)
commit3a6e56534d6a719e8c8f14d8587c437362b3c9f9
treee327732176ceedaa1caa755675a75d4add93fc0a
parent2a258c9f2d1ea12c8fc8021c51ce7a5d8324ac6b
parentd7b3cc0c69b02cad4090a0068349f1ab83e3112f
am d7b3cc0c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd7b3cc0c69b02cad4090a0068349f1ab83e3112f':