OSDN Git Service

merge in master-release history after reset to master
authorThe Android Automerger <android-build@google.com>
Tue, 18 Jun 2013 14:50:15 +0000 (07:50 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 18 Jun 2013 14:50:15 +0000 (07:50 -0700)

Trivial merge