OSDN Git Service

merge in jb-mr2-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Wed, 13 Feb 2013 13:55:55 +0000 (05:55 -0800)
committerThe Android Automerger <android-build@android.com>
Wed, 13 Feb 2013 13:55:55 +0000 (05:55 -0800)

Trivial merge