OSDN Git Service

merge in jb-mr2-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 19 Feb 2013 17:51:20 +0000 (09:51 -0800)
committerThe Android Automerger <android-build@android.com>
Tue, 19 Feb 2013 17:51:20 +0000 (09:51 -0800)

Trivial merge