OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Mon, 30 Jul 2012 16:45:58 +0000 (09:45 -0700)
committerThe Android Automerger <android-build@android.com>
Mon, 30 Jul 2012 16:45:58 +0000 (09:45 -0700)

Trivial merge