merge in lmp-release history after reset to 0fef06294c

This commit is contained in:
The Android Automerger 2014-09-07 06:11:07 -07:00
commit be1fa3cfeb

Diff Content Not Available