merge in lmp-release history after reset to 7d1cd4aae2

This commit is contained in:
The Android Automerger 2014-08-10 06:08:54 -07:00
commit be1e46f41f

Diff Content Not Available