OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Thu, 21 Feb 2013 16:30:27 +0000 (08:30 -0800)
committerThe Android Automerger <android-build@android.com>
Thu, 21 Feb 2013 16:30:27 +0000 (08:30 -0800)

Trivial merge