merge in lmp-release history after reset to 8f3b7ce889

This commit is contained in:
The Android Automerger 2014-08-06 06:09:30 -07:00
commit 41420ae708

Diff Content Not Available