OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 12 Oct 2012 18:49:48 +0000 (11:49 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 12 Oct 2012 18:49:48 +0000 (11:49 -0700)

Trivial merge