OSDN Git Service

merge in master-release history after reset to 8c008397141bf9a7d619eb2c53452bf3e397da39
authorThe Android Automerger <android-build@google.com>
Tue, 13 May 2014 12:51:16 +0000 (05:51 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 13 May 2014 12:51:16 +0000 (05:51 -0700)

Trivial merge