Merge "Wifi usability: Add @SystemApi to send Wifi usability stats"

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

Thu, 24 Jan 2019 04:54:45 +0000 (04:54 +0000)

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

Thu, 24 Jan 2019 04:54:45 +0000 (04:54 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 24 Jan 2019 04:54:45 +0000 (04:54 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 24 Jan 2019 04:54:45 +0000 (04:54 +0000)
diff --cc Android.bp
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 24 Jan 2019 04:54:45 +0000 (04:54 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 24 Jan 2019 04:54:45 +0000 (04:54 +0000)
		1	2
Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history