OSDN Git Service

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
authorThe Android Automerger <android-build@android.com>
Fri, 14 Dec 2012 21:56:20 +0000 (13:56 -0800)
committerThe Android Automerger <android-build@android.com>
Fri, 14 Dec 2012 21:56:20 +0000 (13:56 -0800)

Trivial merge