merge in lmp-release history after reset to 3b14e5b1f3

This commit is contained in:
The Android Automerger 2014-08-14 06:11:58 -07:00
commit 5228d9f0a3

Diff Content Not Available