OSDN Git Service

merge in lmp-mr1-release history after reset to 5105960d49bfa86efeeea8f87c87aa96b5771c37
authorThe Android Automerger <android-build@google.com>
Thu, 25 Sep 2014 13:13:48 +0000 (06:13 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 25 Sep 2014 13:13:48 +0000 (06:13 -0700)

Trivial merge