merge in lmp-mr1-release history after reset to 7aa0c47e42

This commit is contained in:
The Android Automerger 2014-11-04 06:12:31 -08:00
commit e1db16b05f

Diff Content Not Available