tree 17251882c4577a14549772eaafb8a8cb7c0c09cb
parent 674d72220a586008c30329327713352f37d64b53
parent 59089be16eb398647b46c40324ae32de4f7d8736
author Daniel Sandler <dsandler@android.com> 1381262869 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381262869 -0700

am 59089be1: am cd85db33: Merge "Out with the sliders, in with the cog." into klp-dev

* commit '59089be16eb398647b46c40324ae32de4f7d8736':
  Out with the sliders, in with the cog.