merge in lmp-release history after reset to 98e56d926b

This commit is contained in:
The Android Automerger 2014-09-04 06:12:35 -07:00
commit 1f3fc764bc

Diff Content Not Available