merge in lmp-release history after reset to b2eb09a9ed

This commit is contained in:
The Android Automerger 2014-08-31 09:30:23 -07:00
commit 2fcb94d52c

Diff Content Not Available