merge in lmp-release history after reset to 08ff802151

This commit is contained in:
The Android Automerger 2014-09-03 06:11:59 -07:00
commit 94acd8e915

Diff Content Not Available