am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
am 1bef480b: Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1

* commit '1bef480b223f03d0fc866f08ca101a07ead89bc2':
  NumberPicker incorectly enforcing minimal width and height.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base