merge in lmp-mr1-release history after reset to 106e582053

This commit is contained in:
The Android Automerger 2014-11-06 06:13:44 -08:00
commit 06e899a83c

Diff Content Not Available