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

Browse Source

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

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

...

This commit is contained in:

Yuri Lin

2022-12-02 03:05:02 +00:00

committed by Automerger Merge Worker

parent ef0d679166 9dd23923b1

commit 6e64b29712

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