merge in lmp-release history after reset to 7d1cd4aae2

This commit is contained in:
The Android Automerger 2014-08-11 06:16:02 +00:00
commit 1db4157611

Diff Content Not Available