OSDN Git Service

Merge "Fix concurrent writes to the hardware composer" into oc-dr1-dev
authorSteven Thomas <steventhomas@google.com>
Tue, 18 Jul 2017 00:23:24 +0000 (00:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 00:23:24 +0000 (00:23 +0000)
am: 87cd11513f

Change-Id: I00d0a5267913c284eddd97bfe7eefb15b9ee403e


Trivial merge