OSDN Git Service

merge in lmp-mr1-release history after reset to 33c6b9e33e58cf51c1b5341d7ba6790f7420e30f
authorThe Android Automerger <android-build@google.com>
Thu, 25 Sep 2014 13:14:56 +0000 (06:14 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 25 Sep 2014 13:14:56 +0000 (06:14 -0700)

Trivial merge