OSDN Git Service

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

Trivial merge