OSDN Git Service

merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Tue, 11 Nov 2014 14:12:33 +0000 (06:12 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 11 Nov 2014 14:12:33 +0000 (06:12 -0800)

Trivial merge