OSDN Git Service

merge in lmp-mr1-release history after reset to 899891ec95c0581d35f47db7bdea75bd49fdca1b
authorThe Android Automerger <android-build@google.com>
Mon, 20 Oct 2014 13:10:37 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 20 Oct 2014 13:10:37 +0000 (06:10 -0700)

Trivial merge