OSDN Git Service

merge in lmp-release history after reset to 7de2bde3c4c3a6ecc7e6f21e3f3322688b718c4a
authorThe Android Automerger <android-build@google.com>
Wed, 27 Aug 2014 13:12:31 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Wed, 27 Aug 2014 13:12:31 +0000 (06:12 -0700)

Trivial merge