tree 605c1d3901142d5b81c05308b95106f606d5735f
parent d055939c7cd1ef78af2c432816a788624e1a2b7b
parent 788c8423d19972389b82a23dec297eb27d819c86
author Todd Kennedy <toddke@google.com> 1471281470 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471281471 +0000

Merge "More settings cleanup"