merge in lmp-release history after reset to 7d1cd4aae2

This commit is contained in:
The Android Automerger 2014-08-09 06:09:53 -07:00
commit 1c04b7d572

Diff Content Not Available