tree 38e0ed0e045804769d55fabaf6b3b99eb106eb0b
parent 86ebf2876dce04c845ae61846f3aa966d13eab8c
parent 6874b17d7937a4616a119aea58c8a9c8acef4e7f
author Jeff Sharkey <jsharkey@android.com> 1378772123 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378772123 -0700

am 6874b17d: am ff44ed58: Merge "Disabled states, more UX work, bug fixes." into klp-dev

* commit '6874b17d7937a4616a119aea58c8a9c8acef4e7f':
  Disabled states, more UX work, bug fixes.