merge in lmp-release history after reset to 33a73bfa0712c483830e4c9abbf4d6a0551478bf

This commit is contained in:
The Android Automerger 2014-09-11 06:09:09 -07:00
commit 1d12f186ed

Diff Content Not Available