Merge "Revert "Revert "Update overscroll and toast UI""" into oc-dr1-dev

author Sergey Vasilinets <sergeyv@google.com>

Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)

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

Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)
author Sergey Vasilinets <sergeyv@google.com>
Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)
diff --cc core/res/res/values/dimens.xml
Simple merge
diff --cc core/res/res/values/styles.xml
Simple merge
author	Sergey Vasilinets <sergeyv@google.com>
	Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 28 Jul 2017 22:02:14 +0000 (22:02 +0000)
		1	2
core/res/res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/styles.xml	patch \|	diff1 \|	diff2 \|	blob \| history