tree f1876e24e4682588b00867d67b60ebd49b245ed4
parent 38bf66db8827070c6709eff408f5de63d9c0f170
parent 64a0eeaeb6fb72403307901725db0765802200d5
author fionaxu <fionaxu@google.com> 1493416795 +0000
committer android-build-merger <android-build-merger@google.com> 1493416795 +0000

Merge "Replace CheckBoxPreference with SwitchPreference" am: 777d4a22dc am: 09c74c603a am: cff664f3fd  -s ours
am: 64a0eeaeb6

Change-Id: Ib9f3a80406850501cef938e3ce059f4140d5cbaa