OSDN Git Service

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


Trivial merge