OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Mon, 17 Sep 2012 00:12:14 +0000 (17:12 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 17 Sep 2012 00:12:14 +0000 (17:12 -0700)

Trivial merge