merge in lmp-release history after reset to 812e039aeb

This commit is contained in:
The Android Automerger 2014-08-05 06:09:14 -07:00
commit 9368ebdc58

Diff Content Not Available