tree faa5de0ba081bd80a330d0828a8ad6d15f665407
parent 680ad5f3f319f17e81d04ebac604bcd7ac976946
parent 7ed53776a053782ca37303075c144926647ac557
author Paul Westbrook <pwestbro@google.com> 1358970185 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358970185 -0800

am 7ed53776: (-s ours) DO NOT MERGE Revert "Change "hide checkboxes" to "show checkboxes""

* commit '7ed53776a053782ca37303075c144926647ac557':
  DO NOT MERGE Revert "Change "hide checkboxes" to "show checkboxes""