[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours am: ff21be103b -s ours am: 16f8c68d8c -s ours

Browse Source

am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is already in history

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

Change-Id: I732f7e86bd1645732809969d2841f95dbab77562

...

This commit is contained in:

Xin Li

2021-05-08 23:49:06 +00:00

committed by Automerger Merge Worker

parent fc0eebc86e 16f8c68d8c

commit 6d919bb2c8

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