OSDN Git Service

am e167e1cf: Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Jun 2012 14:55:30 +0000 (07:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Jun 2012 14:55:30 +0000 (07:55 -0700)
* commit 'e167e1cf7f23f3605523c6c6808a1a39eecc74ef':


Trivial merge