tree 3bc54a8a9a512229801ae207b9c918c8bdd2ce75
parent df72069202d12a97485874486a30bb79327f8eb7
parent 83b8a6b866cae013b302482e173a1b3a8541ac70
author Wale Ogunwale <ogunwale@google.com> 1566059162 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1566059162 +0000

Merge changes from topic "wm-unify"

* changes:
  Renamed some members of AppWindowToken (49/n)
  Removed cancelRecentsAnimationSynchronously() call path (48/n)
  Reset some threads after test finishes.
  Adopt upstream Mockito's solution to mem leak.
  Unify WM test setup for system services (47/n)