OSDN Git Service

Merge "Fix deadlock when transitioning to vr flinger" into oc-mr1-dev
authorSteven Thomas <steventhomas@google.com>
Sat, 30 Sep 2017 00:51:21 +0000 (00:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 30 Sep 2017 00:51:21 +0000 (00:51 +0000)

Trivial merge