merge in lmp-mr1-release history after reset to 793fc0e13d

This commit is contained in:
The Android Automerger 2014-11-03 06:11:11 -08:00
commit 1ece08100d

Diff Content Not Available