merge in lmp-release history after reset to b2eb09a9ed

This commit is contained in:
The Android Automerger 2014-09-01 07:54:46 -07:00
commit daebe2764b

Diff Content Not Available