eaeae1876ef3485f3422a5ec63bd4056e8faf965 - platform/frameworks/base

commit	eaeae1876ef3485f3422a5ec63bd4056e8faf965	[log] [tgz]
author	davidln <davidln@google.com>	Thu May 30 14:25:01 2019 -0700
committer	davidln <davidln@google.com>	Wed Jun 26 18:23:20 2019 -0700
tree	f9aacba60390581a1f3ac3f44b54f906e22683e4
parent	0d37ba1428e0bf7a54a0c9c20a48b568dd695634 [diff]

resolve merge conflicts of d2310e6ce337acd5f31a9342151458422826a5d8 to qt-r1-bubbles-dev

Bug: 128932906

Test: build
Change-Id: Idabad8379cded664bcf302d5c6fb69564d158eb7

core/java/android/app/ITaskStackListener.aidl[diff]
core/java/android/app/TaskStackListener.java[diff]
packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java[diff]
packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListener.java[diff]
packages/SystemUI/shared/src/com/android/systemui/shared/system/TaskStackChangeListeners.java[diff]
services/core/java/com/android/server/wm/Task.java[diff]
services/core/java/com/android/server/wm/TaskChangeNotificationController.java[diff]
services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java[diff]

8 files changed