[automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours am: 60b92f8e94 -s ours am: 69d7e7f3c4 -s ours am: 6d513a2c67 -s ours

Browse Source

am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1613686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibffb65710eb5b9d27117a010b8cd51067e0e1372

...

This commit is contained in:

Xin Li

2021-03-04 00:40:21 +00:00

committed by Automerger Merge Worker

parent 6685820641 6d513a2c67

commit a14cb35bb6

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