am 84fc60c4: Factor out the manufacturer name (and the device name as well) Merge commit '84fc60c44f722d55f0814f4ff107417a3ac73ed7' into gingerbread-plus-aosp * commit '84fc60c44f722d55f0814f4ff107417a3ac73ed7': Factor out the manufacturer name (and the device name as well)