OSDN Git Service

am 5b1a974d: Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Jun 2012 16:25:46 +0000 (09:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Jun 2012 16:25:46 +0000 (09:25 -0700)
* commit '5b1a974d08aa0bfa25d890026b38073375bdbf55':


Trivial merge