merge in lmp-release history after reset to 5466c3d20d

This commit is contained in:
The Android Automerger 2014-08-23 06:11:10 -07:00
commit 859b223a6c

Diff Content Not Available