OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Thu, 9 Aug 2012 16:29:59 +0000 (09:29 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 9 Aug 2012 16:29:59 +0000 (09:29 -0700)

Trivial merge