OSDN Git Service

merge in lmp-mr1-release history after reset to 050d2d9e323fecb3b17a145bb95ec9d57b31df52
authorThe Android Automerger <android-build@google.com>
Sun, 26 Oct 2014 13:10:40 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Sun, 26 Oct 2014 13:10:40 +0000 (06:10 -0700)

Trivial merge