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:36:56 +0000 (23:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 27 Dec 2016 23:37:00 +0000 (23:37 +0000)

Trivial merge