merge in lmp-release history after reset to d8e007695c

This commit is contained in:
The Android Automerger 2014-08-18 06:08:40 -07:00
commit 58df7d814e

Diff Content Not Available