OSDN Git Service

merge in jb-mr2-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 7 Feb 2013 15:11:12 +0000 (07:11 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 7 Feb 2013 15:11:12 +0000 (07:11 -0800)

Trivial merge