Merge "DO NOT MERGE Use realCallerId to check launch display for Bubbles" into qt...

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

Wed, 18 Sep 2019 00:21:23 +0000 (00:21 +0000)

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

Wed, 18 Sep 2019 00:21:23 +0000 (00:21 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 18 Sep 2019 00:21:23 +0000 (00:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 18 Sep 2019 00:21:23 +0000 (00:21 +0000)
diff --cc services/core/java/com/android/server/wm/RootActivityContainer.java
Simple merge
diff --cc services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 18 Sep 2019 00:21:23 +0000 (00:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 18 Sep 2019 00:21:23 +0000 (00:21 +0000)
		1	2
services/core/java/com/android/server/wm/RootActivityContainer.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java	patch \|	diff1 \|	diff2 \|	blob \| history