tree acbd5f28babaa91333c2b2b208ffb63e4c7361a1
parent 56cd7db1a02c4c08176e8693be7c9c9ab2c9589a
parent 6c458c641a6843bd251734770aa2514eb493a798
author Treehugger Robot <treehugger-gerrit@google.com> 1613709776 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613709776 +0000

[automerger skipped] Merge "Fix OverlayDeviceTests for un-rooted devices" am: 41663a0eb6 am: 7a278ceb40 am: 6c458c641a -s ours

am skip reason: Change-Id I4377207428182fbb76c09abef248b69eeae6acf5 with SHA-1 7c8e650c2b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I810bc7fbee81432632ff90ba96bf1e6446ea0b6b