OSDN Git Service

merge in master-release history after reset to c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:51:01 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 12:51:01 +0000 (05:51 -0700)

Trivial merge