OSDN Git Service

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
authorThe Android Automerger <android-build@android.com>
Tue, 6 Nov 2012 10:28:13 +0000 (02:28 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 6 Nov 2012 10:28:13 +0000 (02:28 -0800)

Trivial merge