merge in lmp-release history after reset to bcbf97ef8f

This commit is contained in:
The Android Automerger 2014-08-31 09:32:30 -07:00
commit 37b73b8808

Diff Content Not Available