tree 5033267063d6764ca4e41c4256b2a5204d36ea82
parent f73856beb15fccce00ff5dab41bb6838ba49e1c8
parent 884dd0f559fb881d65ca303b2ffc6dd3f6663da8
author Hall Liu <hallliu@google.com> 1570646201 -0700
committer android-build-merger <android-build-merger@google.com> 1570646201 -0700

Merge "Fix race in TelephonyScanManager"
am: 884dd0f559

Change-Id: If79d695c2bdb83cf7c902bc540da5b8b427268f4