OSDN Git Service

merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Wed, 7 Nov 2012 21:06:04 +0000 (13:06 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 7 Nov 2012 21:06:04 +0000 (13:06 -0800)

Trivial merge