OSDN Git Service

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

Trivial merge