OSDN Git Service

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

Trivial merge