Merge "Added suggestions for gestures."

author Daniel Sheng <dsheng@google.com>

Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)
author Daniel Sheng <dsheng@google.com>
Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)
diff --cc AndroidManifest.xml
Simple merge
diff --cc src/com/android/settings/Settings.java
Simple merge
author	Daniel Sheng <dsheng@google.com>
	Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 6 Jul 2017 00:34:06 +0000 (00:34 +0000)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/Settings.java	patch \|	diff1 \|	diff2 \|	blob \| history