merge in lmp-release history after reset to 7efad83d43

This commit is contained in:
The Android Automerger 2014-09-10 06:09:15 -07:00
commit fab4d76b46

Diff Content Not Available