OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Mon, 6 Aug 2012 13:29:41 +0000 (06:29 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 6 Aug 2012 13:29:41 +0000 (06:29 -0700)

Trivial merge