merge in lmp-release history after reset to 84d0683a82

This commit is contained in:
The Android Automerger 2014-08-26 06:09:09 -07:00
commit 489b5d23fd

Diff Content Not Available