OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Mon, 13 Aug 2012 15:09:24 +0000 (08:09 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 13 Aug 2012 15:09:24 +0000 (08:09 -0700)

Trivial merge