merge in lmp-release history after reset to b1f0f288e3

This commit is contained in:
The Android Automerger 2014-08-19 06:11:27 -07:00
commit 70adb800fb

Diff Content Not Available