merge in lmp-release history after reset to a02e9484be

This commit is contained in:
The Android Automerger 2014-08-03 06:09:00 -07:00
commit 6a7b67ab55

Diff Content Not Available