OSDN Git Service

merge in jb-mr1-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 26 Jul 2012 14:11:08 +0000 (07:11 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 26 Jul 2012 14:11:08 +0000 (07:11 -0700)

Trivial merge