tree ebdd691b4728bf342e522256438caea50adccd4f
parent 69cd215add96c265beaadb155826589286fe8342
parent 5f5020d42e3403332804245a0d8e0a9a58a1d126
author Christopher Tate <ctate@google.com> 1557867119 -0700
committer android-build-merger <android-build-merger@google.com> 1557867119 -0700

Merge "Must synchronize for ...Locked() code paths" into qt-dev
am: 5f5020d42e

Change-Id: I8e0422d6858b734cab89e8721654ac0a441f201b