OSDN Git Service

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

Trivial merge