OSDN Git Service

Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev am...
authorAdrian Roos <roosa@google.com>
Tue, 27 Dec 2016 23:57:55 +0000 (23:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Dec 2016 23:57:55 +0000 (23:57 +0000)
am: 99a921a272

Change-Id: Ic2cb9f827131aeb44a330e51516401bc0808e8d5


Trivial merge