[automerger skipped] Merge "GesturesSettingPreferenceController to Toggle" into pi-dev am: 283ac08e86
am: c10ae96139
-s ours
Change-Id: I4b0047ab04c86adac1d75e2c34184c85d3c9c3db
This commit is contained in: