OSDN Git Service

merge in jb-mr2-release history after reset to jb-mr2-dev
authorThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:18:21 +0000 (09:18 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:18:21 +0000 (09:18 -0700)

Trivial merge