OSDN Git Service

merge in lmp-release history after reset to c8c5e4c66b858fc41bdb696421eb13c3ea65a238
authorThe Android Automerger <android-build@google.com>
Mon, 18 Aug 2014 13:10:33 +0000 (06:10 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 18 Aug 2014 13:10:33 +0000 (06:10 -0700)

Trivial merge