merge in lmp-release history after reset to 3b14e5b1f3

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

Diff Content Not Available