tree 9656cc1bd66b5cf25551cb731949cd77ee54200a
parent 963c1e2628ab8dec03b603f2924d6cf9f2063d1b
parent 000aedd5f4ca185eabfde086b8f6fb9f65fbdc6e
author Lucas Dupin <dupin@google.com> 1501023259 +0000
committer android-build-merger <android-build-merger@google.com> 1501023259 +0000

Merge "Ambient indicator text color" into oc-dr1-dev am: 5c6c7586cd  -s ours am: af12e50e00  -s ours
am: 000aedd5f4  -s ours

Change-Id: Ic2ac7b8eab5bdf71377fac70dce7788426851212