merge in lmp-release history after reset to a02e9484be

This commit is contained in:
The Android Automerger 2014-08-04 06:08:48 -07:00
commit bc21ee5003

Diff Content Not Available