merge in lmp-release history after reset to 84d0683a82

This commit is contained in:
The Android Automerger 2014-08-24 06:08:24 -07:00
commit 3bd669c605

Diff Content Not Available