merge in lmp-release history after reset to 5e7504bb77

This commit is contained in:
The Android Automerger 2014-09-13 08:43:26 -07:00
commit 77e252057f

Diff Content Not Available