OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:18:02 +0000 (09:18 -0700)
committerThe Android Automerger <android-build@android.com>
Tue, 2 Apr 2013 16:18:02 +0000 (09:18 -0700)

Trivial merge