OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 30 Apr 2013 17:23:37 +0000 (10:23 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 30 Apr 2013 17:23:37 +0000 (10:23 -0700)

Trivial merge