commit | 06e9e8b3a957d01dc6f766184f3f4de22e4c9912 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Sat May 08 22:45:12 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 08 22:45:12 2021 +0000 |
tree | 25f5d09e1309d016eed9072fb393a7822cc50f7d | |
parent | a7d220aad771f220aadd429c81cead8254fa6746 [diff] | |
parent | c41debcf7f93aa81f00fb18487b85a891e0d429b [diff] |
[automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours 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: I17c63dac08252e5f31b334731e25837ace0ab965