merge in lmp-release history after reset to 7eff26a02a

This commit is contained in:
The Android Automerger 2014-09-09 06:13:08 -07:00
commit c994b54ba3

Diff Content Not Available