Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev

am: 02f07cce35

Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
This commit is contained in:
Adrian Roos
2016-12-27 23:49:53 +00:00
committed by android-build-merger

Diff Content Not Available