merge in lmp-release history after reset to bb6adf0d5a

This commit is contained in:
The Android Automerger 2014-08-07 06:10:00 -07:00
commit 1de31e0a95

Diff Content Not Available