merge in lmp-release history after reset to 6df7b609984479c894be81140730578896dbdd8f

This commit is contained in:
The Android Automerger 2014-08-19 06:08:52 -07:00
commit 08f6f664ed

Diff Content Not Available