Merge "Merge "Fix issue with slippery flag not being updated correctly" into pi-dev...

author Winson Chung <winsonc@google.com>

Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)

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

Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)
author Winson Chung <winsonc@google.com>
Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 24 May 2018 23:34:33 +0000 (16:34 -0700)