[automerger skipped] Disallow data when QNS switched the preference am: 3a72957b4b am: d773fb8f40 -s ours am: 0d4fb1e2e4 -s ours

Browse Source

am skip reason: Merged-In I1a0c86a978756d5b05851d939e011010f8f1afc2 with SHA-1 50a8fccec7 is already in history

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

Change-Id: Ib3ca56e5dc0ac06a45afb0f13ea50fac073c2ef8

...

This commit is contained in:

Jack Yu

2021-07-13 17:42:01 +00:00

committed by Automerger Merge Worker

parent 020e0b9221 0d4fb1e2e4

commit 9d330104ea

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