tree 867dd11d71b8b75874caaf312a79512d62de2d82
parent 20a2484e580ad3e312fe2fd84ce2a0662af78484
author Anil Admal <aadmal@google.com> 1549508767 -0800
committer Anil Admal <aadmal@google.com> 1549577601 -0800

Merge partner fix for ComprehensiveCountryDetector deadlock

The fix is in comment #1 in b/70679249

Bug: 70679249
Test: Code inspection. Existing tests pass.
Change-Id: I4a195239da2f5b82e273cb259bea1c9c79dc4d52