merge in lmp-mr1-release history after reset to 131866e1a4

This commit is contained in:
The Android Automerger 2014-10-26 06:10:18 -07:00
commit da3a013ca2

Diff Content Not Available