OSDN Git Service

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

Trivial merge