OSDN Git Service

merge in jb-mr1-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 24 Jul 2012 15:27:52 +0000 (08:27 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 24 Jul 2012 15:27:52 +0000 (08:27 -0700)

Trivial merge