OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Thu, 1 Nov 2012 01:33:52 +0000 (18:33 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 1 Nov 2012 01:33:52 +0000 (18:33 -0700)

Trivial merge