OSDN Git Service

Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
authorAdrian Roos <roosa@google.com>
Tue, 27 Dec 2016 23:49:53 +0000 (23:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Dec 2016 23:49:53 +0000 (23:49 +0000)
commit99a921a272e5e80635d930a9cbc2f46d21bb8227
tree81a4e4f2810c62393519316c5c101cc373d3665d
parentdff956b0e052f5a1c43d4d0530bf56dd0bd3ac82
parent02f07cce35103dc096193fb798625cf81dc74fa9
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am: 02f07cce35

Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6