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

Browse Source

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

...

This commit is contained in:

Treehugger Robot

2021-02-19 04:42:56 +00:00

committed by Automerger Merge Worker

parent 56cd7db1a0 6c458c641a

commit 0d989e9672

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available