merge in lmp-release history after reset to 5bbf73ced3

This commit is contained in:
The Android Automerger 2014-09-16 06:13:06 -07:00
commit 7b463a21f7

Diff Content Not Available