tree fc6a3a0cc802300074bcebbe3e08a311ecccabb0
parent ac617824314daebb912d8fb6da5e1f2ed75da03b
parent 02e23fb0eb96280c7874d8b5d65b56bb9fc284ba
author Elliott Hughes <enh@google.com> 1372179366 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372179366 -0700

am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."

* commit '02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
  Clamp date setting for the SetupWizard as well as Settings.