merge in lmp-release history after reset to 2ab32d6915

This commit is contained in:
The Android Automerger 2014-09-13 06:13:31 -07:00
commit 9582d66692

Diff Content Not Available