merge in lmp-release history after reset to b1982b75c4

This commit is contained in:
The Android Automerger 2014-09-22 06:13:42 -07:00
commit da10dcc5dd

Diff Content Not Available