[automerger skipped] Merge "Add enforcement parameter to RequiresFeature" am: dd438b73cc am: 371eea87de am: 551931360b -s ours

Browse Source

am skip reason: Change-Id Ia4cc8be8fdccbdeeecee956e4ccf02bda6d91845 with SHA-1 5bfa4239c1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacedffbb6da07e13e992cb907bfffeb8606c0c4c

...

This commit is contained in:

Treehugger Robot

2021-01-27 07:56:25 +00:00

committed by Automerger Merge Worker

parent 1df1f3f180 551931360b

commit 4bcc91667c

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