OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Mon, 8 Oct 2012 01:58:14 +0000 (18:58 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 8 Oct 2012 01:58:14 +0000 (18:58 -0700)

Trivial merge