tree d1fa6a40bb14a0792b88601c37a50bc278c0dacc
parent 0b3d75f15f777c867c751520477ba12a8fb783ce
parent 777d4a22dcf1e972f91087a37f8f14ae5639cb93
author fionaxu <fionaxu@google.com> 1493409689 +0000
committer android-build-merger <android-build-merger@google.com> 1493409689 +0000

Merge "Replace CheckBoxPreference with SwitchPreference"
am: 777d4a22dc

Change-Id: Ide3f56f063d5a7ceff14732c72c9bcdaa1085788