merge in lmp-release history after reset to 0fef06294c

This commit is contained in:
The Android Automerger 2014-09-08 06:13:51 -07:00
commit 4d1022b20c

Diff Content Not Available