OSDN Git Service

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

Trivial merge