[conflict] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into tm-dev am: 0232c797eb am: be808625c3

Browse Source

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

Change-Id: I02c300fa04b0d08e9dc9dc7393b3496edabb38c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Yuri Lin

2022-12-01 20:19:14 +00:00

committed by Automerger Merge Worker

parent 7f33108dd6 be808625c3

commit e7331ca53c

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