merge in lmp-mr1-release history after reset to 8fab8119dd176a280b62e9e8f2b4f08c0d76f36d

This commit is contained in:
The Android Automerger 2014-10-23 06:09:33 -07:00
commit 0e5f7b9b3c

Diff Content Not Available