OSDN Git Service

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

Trivial merge