am 5681861a: am c47f80f1: Merge "Don\'t assume a default of \'false\' for...
am 5681861a: am c47f80f1: Merge "Don\'t assume a default of \'false\' for TwoStatePreference" into jb-mr1-dev
* commit '5681861a':
Don't assume a default of 'false' for TwoStatePreference