Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2479e227 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into... 

Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f7 am: 5546e306

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



Change-Id: I4159f8a72869c460a6f22691a1a293cd185b0f62
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d826f99e 5546e306
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment