OSDN Git Service

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

Trivial merge