Merge "hotspot2: register Passpoint related intents as protected broadcast" am: 97bde...

author Peter Qiu <zqiu@google.com>

Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)

committer android-build-merger <android-build-merger@google.com>

Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)
author Peter Qiu <zqiu@google.com>
Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Peter Qiu <zqiu@google.com>
	Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 28 Mar 2017 00:03:03 +0000 (00:03 +0000)