merge in lmp-release history after reset to 5bbf73ced3

This commit is contained in:
The Android Automerger 2014-09-17 06:13:11 -07:00
commit 1255b81a87

Diff Content Not Available