OSDN Git Service

merge in lmp-mr1-release history after reset to 8caf06fd90e877e6c0a4cc1e63bb5b5222704abe
authorThe Android Automerger <android-build@google.com>
Thu, 6 Nov 2014 14:14:49 +0000 (06:14 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 6 Nov 2014 14:14:49 +0000 (06:14 -0800)

Trivial merge