merge in lmp-release history after reset to 1e010d60397db706cd3d1c4d5701a2bced441aa8

This commit is contained in:
The Android Automerger 2014-09-04 06:09:31 -07:00
commit dc3814bcf9

Diff Content Not Available