merge in lmp-release history after reset to 7de2bde3c4

This commit is contained in:
The Android Automerger 2014-08-27 06:12:31 -07:00
commit b9fb509a7d

Diff Content Not Available