OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Tue, 23 Oct 2012 23:47:27 +0000 (16:47 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 23 Oct 2012 23:47:27 +0000 (16:47 -0700)

Trivial merge