merge in lmp-release history after reset to c8c5e4c66b

This commit is contained in:
The Android Automerger 2014-08-18 06:10:33 -07:00
commit 9c6a8187f4

Diff Content Not Available