OSDN Git Service

merge in lmp-mr1-release history after reset to 71e351d96b551ccdbc39b52a0c66da86cae83701
authorThe Android Automerger <android-build@google.com>
Sat, 27 Sep 2014 13:11:32 +0000 (06:11 -0700)
committerThe Android Automerger <android-build@google.com>
Sat, 27 Sep 2014 13:11:32 +0000 (06:11 -0700)

Trivial merge