OSDN Git Service

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

Trivial merge