merge in lmp-mr1-release history after reset to 91c395f6c3

This commit is contained in:
The Android Automerger 2014-10-19 06:09:58 -07:00
commit 6fc658bac9

Diff Content Not Available