OSDN Git Service

merge in lmp-mr1-release history after reset to b1982b75c4f3d9c812d9c49ca294132430c7cd8d
authorThe Android Automerger <android-build@google.com>
Mon, 22 Sep 2014 18:44:59 +0000 (11:44 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 22 Sep 2014 18:44:59 +0000 (11:44 -0700)

Trivial merge