merge in lmp-release history after reset to 7e00b44e80d6e38b8ab86d0ebc86b666c0ac2ef6

This commit is contained in:
The Android Automerger 2014-09-13 06:09:46 -07:00
commit 25232c43fc

Diff Content Not Available