[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours am: 0cf175a248 -s ours am: 41a3026a47 -s ours am: e59429af7c -s ours

Browse Source

am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history

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

Change-Id: Id989d9d1c765b602227eafaab7bb3ba76bf041ac

...

This commit is contained in:

Xin Li

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

committed by Automerger Merge Worker

parent 564d9e9bfe e59429af7c

commit 89754d4438

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