Merge "Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev am: 682aa90930 am: fe53de4820" into sc-v2-dev-plus-aosp

This commit is contained in:
Automerger Merge Worker
2021-07-08 04:06:30 +00:00
committed by Android (Google) Code Review

Diff Content Not Available