OSDN Git Service

am 95bd5ab9: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:37:20 +0000 (13:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Aug 2012 20:37:20 +0000 (13:37 -0700)
commit54d77364f4819df87d076be7a9754d4d03a223b1
treef641f279b761815507493003f851dc628362a748
parent47d9f7faee135c5ddf4e23b913538d98d8977702
parent95bd5ab91211e208b1080b3fa0696b75838d7b4f
am 95bd5ab9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '95bd5ab91211e208b1080b3fa0696b75838d7b4f':