OSDN Git Service

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

Trivial merge