merge in lmp-release history after reset to c86950cb3f50ead0c9a9d0366b870d6c6e1b91c8

This commit is contained in:
The Android Automerger 2014-07-24 06:08:27 -07:00
commit 13fb0584e1

Diff Content Not Available