OSDN Git Service

merge in master-release history after reset to 244e25ef817ddf48727845f14d08b2b787e1ff89
authorThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:04 +0000 (07:22 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 22 May 2014 14:22:04 +0000 (07:22 -0700)

Trivial merge