tree 684230b4b7b768d7a650b42afb6a344761fc5d10
parent ad1b60d2bf9cf8b702e21329671970e77bf5d68b
parent 226912b41c07b58222d5337718185007cc689f49
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581351741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1581351741 +0000

Merge "[adbwifi] Add SettingsUI strings for wireless debugging." am: 226912b41c

Change-Id: Iae892132834ae52865c43b306499b9da7c86c414