OSDN Git Service

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

Trivial merge