merge in lmp-release history after reset to aaad548535

This commit is contained in:
The Android Automerger 2014-09-28 06:10:03 -07:00
commit 28a7ed042f

Diff Content Not Available