tree 913be16798b67a3478fd96fa0f4c95dfe2b4c7f6
parent 6f70d2f9f082aca69e0cc816882b760c71fc8d1c
parent f67ba767a072ce56b8676a21a9ce36e1266c9b9f
author Hall Liu <hallliu@google.com> 1570648610 -0700
committer android-build-merger <android-build-merger@google.com> 1570648610 -0700

Merge "Fix race in TelephonyScanManager" am: 884dd0f559 am: 0c85ca1062 am: 8fd8b5b234
am: f67ba767a0

Change-Id: I321948af64ad9e6299d893647de77ff20d6f1363