tree 8d16b630849231a36c4551b45e65ce33005fb815
parent b43f66d522e5805e1857fda4a934b7fdf82d6104
parent f15bbc4090bc9c559018754ae8326e3140fe979a
author Anthony Chen <ajchen@google.com> 1524001045 -0700
committer android-build-merger <android-build-merger@google.com> 1524001045 -0700

Merge "Add an attribute to set the scroll bar thumb color." into pi-preview1-androidx-dev
am: f15bbc4090

Change-Id: I30dab2e7c2d26522257975be52dd65f04f4f128f