merge in lmp-release history after reset to 84d0683a824fa02dbaa6d1b56a79223804b54e80

This commit is contained in:
The Android Automerger 2014-08-23 06:09:07 -07:00
commit cb278332cb

Diff Content Not Available