OSDN Git Service

merge in master-release history after reset to 978d30d0e046c971b37a6fc20480615f1c55f55c
authorThe Android Automerger <android-build@google.com>
Wed, 7 May 2014 16:11:44 +0000 (09:11 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 7 May 2014 16:11:44 +0000 (09:11 -0700)

Trivial merge