tree b70e335fa9c9ae221ea5a4c01d4b3cd2f14ca353
parent 38a698adfc708229c90ad0997d91319a4d4a28b0
parent 9c37307a1e0b59572fc474a77aeeb371477a3e8a
author Marco Nelissen <marcone@google.com> 1320158786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320158786 +0000

am 9c37307a: Switch the spinner to "user" when changing sliders

* commit '9c37307a1e0b59572fc474a77aeeb371477a3e8a':
  Switch the spinner to "user" when changing sliders