merge in lmp-release history after reset to 61a4eecbe6

This commit is contained in:
The Android Automerger 2014-08-21 06:12:17 -07:00
commit fe63a21a35

Diff Content Not Available