merge in lmp-release history after reset to d94854030c

This commit is contained in:
The Android Automerger 2014-09-23 06:16:24 -07:00
commit 2969368f4b

Diff Content Not Available