Merge "Remove non-safe mode boot vibration." into oc-dr1-dev am: 149ff697ff

author Michael Wright <michaelwr@google.com>

Mon, 24 Jul 2017 13:01:35 +0000 (13:01 +0000)

committer android-build-merger <android-build-merger@google.com>

Mon, 24 Jul 2017 13:01:35 +0000 (13:01 +0000)
author Michael Wright <michaelwr@google.com>
Mon, 24 Jul 2017 13:01:35 +0000 (13:01 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 24 Jul 2017 13:01:35 +0000 (13:01 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Michael Wright <michaelwr@google.com>
	Mon, 24 Jul 2017 13:01:35 +0000 (13:01 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 24 Jul 2017 13:01:35 +0000 (13:01 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history