OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Wed, 10 Oct 2012 21:06:21 +0000 (14:06 -0700)
committerThe Android Automerger <android-build@android.com>
Wed, 10 Oct 2012 21:06:21 +0000 (14:06 -0700)

Trivial merge