tree c0d6d5fad13ed536f261972b1cc255bd6e377859
parent 272247aa1f540f7c9b7fafa35bb59e507131d3f5
parent e9812bae0e0ce08bd232dc2371fdb959e4f7a318
author Svetoslav Ganov <svetoslavganov@google.com> 1353429496 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353429496 -0800

am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev

* commit 'e9812bae0e0ce08bd232dc2371fdb959e4f7a318':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)