OSDN Git Service

merge in lmp-mr1-release history after reset to 0cc59dd303205de7110e298e9b90b1c3b98f4711
authorThe Android Automerger <android-build@google.com>
Wed, 29 Oct 2014 13:08:51 +0000 (06:08 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 29 Oct 2014 13:08:51 +0000 (06:08 -0700)

Trivial merge