OSDN Git Service

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

Trivial merge