OSDN Git Service

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

Trivial merge