merge in lmp-release history after reset to c1a6a72560

This commit is contained in:
The Android Automerger 2014-07-27 06:08:13 -07:00
commit 8bc74887c1

Diff Content Not Available