merge in lmp-mr1-release history after reset to 9cea6ccbd8

This commit is contained in:
The Android Automerger 2014-11-05 06:13:00 -08:00
commit fb4dbc40d1

Diff Content Not Available