OSDN Git Service

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
authorThe Android Automerger <android-build@android.com>
Wed, 14 Nov 2012 19:28:52 +0000 (11:28 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 14 Nov 2012 19:28:52 +0000 (11:28 -0800)

Trivial merge