OSDN Git Service

Merge "Fix race condition in displayservice." into oc-dev
authorSteven Moreland <smoreland@google.com>
Fri, 19 May 2017 00:12:01 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 00:12:01 +0000 (00:12 +0000)
am: 02e3c25f95

Change-Id: I2497f6867fa92f1d746d24c920ba62762b11b49b


Trivial merge