OSDN Git Service

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

Trivial merge