OSDN Git Service

merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996
authorThe Android Automerger <android-build@google.com>
Sat, 17 May 2014 12:51:11 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 17 May 2014 12:51:11 +0000 (05:51 -0700)

Trivial merge