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

This commit is contained in:
The Android Automerger 2014-11-02 06:10:50 -08:00
commit 9bb99b2f23

Diff Content Not Available