OSDN Git Service

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

Trivial merge