OSDN Git Service

merge in lmp-mr1-release history after reset to f191bb2ef67b882daa31251e3c6511c818e50cf5
authorThe Android Automerger <android-build@google.com>
Thu, 30 Oct 2014 13:12:00 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 30 Oct 2014 13:12:00 +0000 (06:12 -0700)

Trivial merge