OSDN Git Service

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

Trivial merge