merge in lmp-release history after reset to 99e0c3cdbe7278cea88ada37aaa24ae0a51cabb5
authorThe Android Automerger <android-build@google.com>
Tue, 26 Aug 2014 13:12:36 +0000 (06:12 -0700)
committerThe Android Automerger <android-build@google.com>
Tue, 26 Aug 2014 13:12:36 +0000 (06:12 -0700)

Trivial merge