OSDN Git Service

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

Change-Id: I817744c1522aa031c6d34cdfa8a2af1445e87712


Trivial merge