merge in lmp-release history after reset to bcbf97ef8f

This commit is contained in:
The Android Automerger 2014-09-02 06:12:14 -07:00
commit c0f4e9d217

Diff Content Not Available