merge in lmp-release history after reset to 44da474bb8

This commit is contained in:
The Android Automerger 2014-09-20 21:00:37 -07:00
commit 59551b8144

Diff Content Not Available