merge in lmp-release history after reset to b1982b75c4

This commit is contained in:
The Android Automerger 2014-09-21 06:11:28 -07:00
commit 5640d5abe3

Diff Content Not Available