merge in lmp-release history after reset to 3b14e5b1f3

This commit is contained in:
The Android Automerger 2014-08-13 06:12:40 -07:00
commit 389c3fd029

Diff Content Not Available