merge in lmp-release history after reset to 5466c3d20d

This commit is contained in:
The Android Automerger 2014-08-24 06:10:21 -07:00
commit 39f2e2fc83

Diff Content Not Available