merge in lmp-release history after reset to 1f3fc764bc

This commit is contained in:
The Android Automerger 2014-09-06 08:51:49 -07:00
commit 93f065b8c4

Diff Content Not Available