OSDN Git Service

merge in lmp-mr1-release history after reset to 5acc751ffea2fab38f7fcc4e06866640e70174e4
authorThe Android Automerger <android-build@google.com>
Wed, 8 Oct 2014 13:13:14 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 8 Oct 2014 13:13:14 +0000 (06:13 -0700)

Trivial merge