Merge "Renaming NumberPicker resources to be consistent." into honeycomb