OSDN Git Service

merge in lmp-mr1-release history after reset to cbc5d0efdcc51f6ca83175a69074371d07203781
authorThe Android Automerger <android-build@google.com>
Thu, 30 Oct 2014 13:12:10 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 30 Oct 2014 13:12:10 +0000 (06:12 -0700)

Trivial merge