OSDN Git Service

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

Trivial merge