am 2ad2bf23: Merge "Renaming NumberPicker resources to be consistent." into honeycomb

* commit '2ad2bf232714009586c5163e08754886bdd9ea20':
  Renaming NumberPicker resources to be consistent.