OSDN Git Service

Merge "Fix Possible Deadlock with getFeatureState" am: 6bebb8418c
authorBrad Ebinger <breadley@google.com>
Mon, 25 Jun 2018 18:53:41 +0000 (11:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jun 2018 18:53:41 +0000 (11:53 -0700)
am: 057f582e09

Change-Id: I3cb9d6457c0348739e57802099c51b0308bbe05d


Trivial merge