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

This commit is contained in:
The Android Automerger 2014-10-16 06:12:17 -07:00
commit 5b2299bb01

Diff Content Not Available