OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Fri, 3 May 2013 14:49:43 +0000 (07:49 -0700)
committerThe Android Automerger <android-build@android.com>
Fri, 3 May 2013 14:49:43 +0000 (07:49 -0700)

Trivial merge