am 9ac68dc6: am 84c5ade8: Merge "Fix vertical scroll computation in NumberPicker" into klp-dev
am 9ac68dc6: am 84c5ade8: Merge "Fix vertical scroll computation in NumberPicker" into klp-dev

* commit '9ac68dc69ffe0104dd098ad14a8a8b103ca8b09e':
  Fix vertical scroll computation in NumberPicker

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