OSDN Git Service

am 8f2f2466: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Aug 2012 21:50:42 +0000 (14:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Aug 2012 21:50:42 +0000 (14:50 -0700)
commit2a258c9f2d1ea12c8fc8021c51ce7a5d8324ac6b
treee327732176ceedaa1caa755675a75d4add93fc0a
parent543960121ceb79d3bd2a7f7bdb91388244e4e9e6
parent8f2f24661870c349a19bff71d85ed5eb897c7c9f
am 8f2f2466: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8f2f24661870c349a19bff71d85ed5eb897c7c9f':