merge in lmp-release history after reset to 7efad83d430f4d824f2aaa75edea5106f6ff8aae

This commit is contained in:
The Android Automerger 2014-09-09 06:09:23 -07:00
commit 604b2f5789

Diff Content Not Available