OSDN Git Service

merge in lmp-mr1-release history after reset to 5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424
authorThe Android Automerger <android-build@google.com>
Thu, 2 Oct 2014 13:14:43 +0000 (06:14 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 2 Oct 2014 13:14:43 +0000 (06:14 -0700)

Trivial merge