OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Sat, 13 Oct 2012 10:50:18 +0000 (03:50 -0700)
committerThe Android Automerger <android-build@android.com>
Sat, 13 Oct 2012 10:50:18 +0000 (03:50 -0700)

Trivial merge