merge in lmp-release history after reset to c8c5e4c66b

This commit is contained in:
The Android Automerger 2014-08-17 07:18:28 -07:00
commit bfdad33b0e

Diff Content Not Available