merge in lmp-release history after reset to c891e24073

This commit is contained in:
The Android Automerger 2014-10-21 06:09:30 -07:00
commit 2155882080

Diff Content Not Available