tree ecda00d7701fc24e070044d0cc46858eb91a884e
parent 1eddd3faa4c46e13d445869bf32d5725f5f20f78
parent 612e51375f00a71ff6d283d75c70ee1f1011858a
author Scott Kennedy <skennedy@google.com> 1354230926 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354230926 -0800

am 612e5137: am 7e0c0bc7: am 3c0b8eea: Change Email vibrate setting from tri-state to checkbox

* commit '612e51375f00a71ff6d283d75c70ee1f1011858a':
  Change Email vibrate setting from tri-state to checkbox