OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Sat, 10 Nov 2012 00:25:31 +0000 (16:25 -0800)
committerThe Android Automerger <android-build@android.com>
Sat, 10 Nov 2012 00:25:31 +0000 (16:25 -0800)

Trivial merge