Merge "Do not hold lock when trying to get snapshot" into qt-dev

author Jorim Jaggi <jjaggi@google.com>

Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)

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

Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)
author Jorim Jaggi <jjaggi@google.com>
Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)
diff --cc services/core/java/com/android/server/wm/ActivityTaskManagerService.java
Simple merge
diff --cc services/core/java/com/android/server/wm/WindowManagerService.java
Simple merge
author	Jorim Jaggi <jjaggi@google.com>
	Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 5 Jun 2019 10:00:16 +0000 (10:00 +0000)
		1	2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/WindowManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history