OSDN Git Service

merge in jb-mr0-release history after reset to jb-dev
authorThe Android Automerger <android-build@android.com>
Fri, 17 Aug 2012 00:57:55 +0000 (17:57 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 17 Aug 2012 00:57:55 +0000 (17:57 -0700)

Trivial merge