merge in lmp-release history after reset to 62205596b9

This commit is contained in:
The Android Automerger 2014-08-20 06:11:45 -07:00
commit cbbf576cfe

Diff Content Not Available