tree 9acaf8139ec9ca2d4626257485d2886b6d8a08f8
parent 89b23901dd3fc978472df27d47e89b835cc4f8ec
parent a2d09a565a5aac8c38f8e0e8ba0e5e8efa675718
author Fabian Kozynski <kozynski@google.com> 1595960297 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595960297 +0000

Merge "Make TileQueryHelperTest less flaky" into rvc-dev am: c59312aaec am: a2d09a565a

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

Change-Id: Ia663fc4c5f3f022966394e44ec1308e435362250