am 2b03173b: am 5b599c31: Merge "Add utility for toggling settings from the cmd line." into gingerbread

Merge commit '2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc'

* commit '2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc':
  Add utility for toggling settings from the cmd line.