Merge "Fix "swipe up to switch apps" pop up displaying in SUW while creating second...

author Tracy Zhou <tracyzhou@google.com>

Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)

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

Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)
author Tracy Zhou <tracyzhou@google.com>
Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
Simple merge
author	Tracy Zhou <tracyzhou@google.com>
	Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 6 Jun 2018 21:09:02 +0000 (14:09 -0700)