OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Tue, 31 Jul 2012 14:35:29 +0000 (07:35 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 31 Jul 2012 14:35:29 +0000 (07:35 -0700)

Trivial merge