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

This commit is contained in:
The Android Automerger 2014-10-18 06:11:01 -07:00
commit 86e63d6297

Diff Content Not Available