tree 7cfb49dbb57a67aaa2aecdd0e0d4254b25f2d4b3
parent 554cdd7792ad47471b8326866715e0606e0c563a
parent bb0db1d243554a87f6320936a0901238396cda37
author Andrei-Valentin Onea <andreionea@google.com> 1601469071 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601469071 +0000

Merge "Fix compat change CTS test flakiness" am: bb0db1d243

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

Change-Id: I0b32b7631d7f9ceade3e170d53ba068db924e85f