tree 61b9103a662a5c9b59828d84f3127cb31ebc6632
parent fc1bde926188d4183dddb4b80341a2109b91986c
parent 6bebb8418ceecf44d2af40033870f3aabacfe36e
author Brad Ebinger <breadley@google.com> 1529952332 -0700
committer android-build-merger <android-build-merger@google.com> 1529952332 -0700

Merge "Fix Possible Deadlock with getFeatureState"
am: 6bebb8418c

Change-Id: I675c116e54d961971d4a32f87dd247cca51b5069