merge in lmp-release history after reset to bcbf97ef8f

This commit is contained in:
The Android Automerger 2014-09-01 07:56:33 -07:00
commit c31e117dbc

Diff Content Not Available