merge in lmp-mr1-release history after reset to 53aad5e7de

This commit is contained in:
The Android Automerger 2014-10-15 06:11:48 -07:00
commit 988df07865

Diff Content Not Available