merge in lmp-release history after reset to 5466c3d20d

This commit is contained in:
The Android Automerger 2014-08-25 06:12:23 -07:00
commit 889f1d7912

Diff Content Not Available