Merge "Reset wait for transition state to false when recents goes invisible" into...

author Matthew Ng <ngmatthew@google.com>

Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)

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

Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)
author Matthew Ng <ngmatthew@google.com>
Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/recents/Recents.java
Simple merge
author	Matthew Ng <ngmatthew@google.com>
	Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 8 Aug 2017 00:47:46 +0000 (00:47 +0000)