OSDN Git Service

merge in lmp-mr1-release history after reset to 131866e1a4cb3c592f923e95a8c1a66291e2057a
authorThe Android Automerger <android-build@google.com>
Sat, 25 Oct 2014 13:11:05 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 25 Oct 2014 13:11:05 +0000 (06:11 -0700)

Trivial merge