merge in lmp-release history after reset to 9e691c1093

This commit is contained in:
The Android Automerger 2014-09-11 06:12:53 -07:00
commit 5e7504bb77

Diff Content Not Available