Merge "Add TestApi to SUSPEND_APPS permission for GTS test." into qt-dev

author Varun Shah <varunshah@google.com>

Wed, 10 Apr 2019 23:03:06 +0000 (23:03 +0000)

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

Wed, 10 Apr 2019 23:03:06 +0000 (23:03 +0000)
author Varun Shah <varunshah@google.com>
Wed, 10 Apr 2019 23:03:06 +0000 (23:03 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 Apr 2019 23:03:06 +0000 (23:03 +0000)
diff --cc api/test-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Varun Shah <varunshah@google.com>
	Wed, 10 Apr 2019 23:03:06 +0000 (23:03 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 Apr 2019 23:03:06 +0000 (23:03 +0000)
		1	2
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history