OSDN Git Service

merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Wed, 11 Mar 2015 00:12:49 +0000 (17:12 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 11 Mar 2015 00:12:49 +0000 (17:12 -0700)

Trivial merge