OSDN Git Service

merge in master-release history after reset to 2079d768f79f636223d89b988a30209adf8dddbe
authorThe Android Automerger <android-build@google.com>
Wed, 14 May 2014 12:50:13 +0000 (05:50 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 14 May 2014 12:50:13 +0000 (05:50 -0700)

Trivial merge