merge in lmp-release history after reset to 027d2717d067c3706f22bf84dc1226ede7c1566d

This commit is contained in:
The Android Automerger 2014-09-23 06:10:52 -07:00
commit 3ae2ad2aea

Diff Content Not Available