tree b19507663e207c6b61e7c96f955df3304c4bed3d
parent 006becaea77a1f6d406ab2bb571c5cd34c1f571c
parent 6c7dc03ecc082f597105722c803073505b933362
author Yao, Yuxing <yaoyx@google.com> 1524090335 -0700
committer android-build-merger <android-build-merger@google.com> 1524090335 -0700

Merge "Update ripple color." into pi-preview1-androidx-dev
am: 6c7dc03ecc

Change-Id: Ia22bba3f36bfdcddbb19bd2f37312d80ec96d22d