merge in lmp-release history after reset to 027d2717d067c3706f22bf84dc1226ede7c1566d

This commit is contained in:
The Android Automerger 2014-09-15 06:09:45 -07:00
commit 6078d68321

Diff Content Not Available