tree 7ef6c654cec1e311ad59cfedea92c998c915975a
parent 9163b1d9ceeca3e956218dda1ca19a748dc48d8d
parent ff44ed58a1e38ff830e74b0d73549ff01725852d
author Jeff Sharkey <jsharkey@android.com> 1378771824 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378771824 -0700

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

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