OSDN Git Service

merge in lmp-mr1-release history after reset to 366998d87109578eb8c33d2e94d61fe7f189beb8
authorThe Android Automerger <android-build@google.com>
Tue, 7 Oct 2014 13:11:36 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 7 Oct 2014 13:11:36 +0000 (06:11 -0700)

Trivial merge