OSDN Git Service

merge in lmp-mr1-release history after reset to b725fcaf1d293bad8e858a4904742541bb11b54d
authorThe Android Automerger <android-build@google.com>
Sun, 5 Oct 2014 13:11:19 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 5 Oct 2014 13:11:19 +0000 (06:11 -0700)

Trivial merge