OSDN Git Service

am 9698d362: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:55:54 +0000 (08:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 10 Aug 2012 15:55:54 +0000 (08:55 -0700)
commit6f80a77adb56dc4b8446e1df02e401cb8202fa4b
tree9c83adb3939194be360981467a1aed25b542c604
parent7edae431eee9b633d78ccc44ce6a006cbf73c999
parent9698d3624c5e66cbff3c89e56a1388b6b2be9c1d
am 9698d362: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9698d3624c5e66cbff3c89e56a1388b6b2be9c1d':