merge in lmp-release history after reset to f00945cfd7

This commit is contained in:
The Android Automerger 2014-08-26 06:12:09 -07:00
commit 3424203e9d

Diff Content Not Available