merge in lmp-release history after reset to 1543fdf616ddebee7819214437527f380e5c743b

This commit is contained in:
The Android Automerger 2014-10-08 06:10:36 -07:00
commit d690d19dd0

Diff Content Not Available