merge in lmp-release history after reset to 1b1966d944

This commit is contained in:
The Android Automerger 2014-08-05 06:08:26 -07:00
commit b4725def2e

Diff Content Not Available