OSDN Git Service

merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Fri, 13 Feb 2015 09:10:38 +0000 (01:10 -0800)
committerThe Android Automerger <android-build@google.com>
Fri, 13 Feb 2015 09:10:38 +0000 (01:10 -0800)

Trivial merge