merge in lmp-release history after reset to b1982b75c4

This commit is contained in:
The Android Automerger 2014-09-20 06:12:10 -07:00
commit 888824cc0d

Diff Content Not Available