OSDN Git Service

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

Trivial merge