merge in lmp-mr1-release history after reset to 899891ec95

This commit is contained in:
The Android Automerger 2014-10-20 06:10:37 -07:00
commit 559935102f

Diff Content Not Available