OSDN Git Service

merge in lmp-mr1-release history after reset to 5954dbde3b8a3d2716b04c067505180b47d0b2ab
authorThe Android Automerger <android-build@google.com>
Thu, 9 Oct 2014 13:11:21 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 9 Oct 2014 13:11:21 +0000 (06:11 -0700)

Trivial merge