Merge "Update strings for Wi-Fi DPP handshake running state"

author TreeHugger Robot <treehugger-gerrit@google.com>

Tue, 26 Feb 2019 07:15:27 +0000 (07:15 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 26 Feb 2019 07:15:27 +0000 (07:15 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Tue, 26 Feb 2019 07:15:27 +0000 (07:15 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 26 Feb 2019 07:15:27 +0000 (07:15 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Tue, 26 Feb 2019 07:15:27 +0000 (07:15 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 26 Feb 2019 07:15:27 +0000 (07:15 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java	patch \|	diff1 \|	diff2 \|	blob \| history