tree 074748ce284317627cb78f4d6cf3b1701969159d
parent 65ce0d0f34ed41572306c93d9e4981ce1b9c382c
parent 8b036e4b65aa3059af9293421b2ead0e6d080c1e
author TreeHugger Robot <treehugger-gerrit@google.com> 1592220317 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592220317 +0000

Merge "Fix testGlobalActions_doesntStealImeControl" into rvc-dev am: ccd0d1e05d am: 8b036e4b65

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851473

Change-Id: I4d01a1f7ca4d0bc25a37a4e26cbafb77af6dc313