OSDN Git Service

Merge "Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c am: 057f582e...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 25 Jun 2018 19:05:33 +0000 (19:05 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 25 Jun 2018 19:05:33 +0000 (19:05 +0000)

Trivial merge