commit | 1c46cd4a38a77113a4b691f3ae33badfc30f485d | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 09:17:18 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 09:17:18 2021 +0000 |
tree | 8129de86124270e392c4b083b86aeb92c98129f0 | |
parent | 769640c06c1c23dfee6d848185b428727f10bb0b [diff] | |
parent | 1119508d1c9adbd36b5297a33a84b64e61cbf33f [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 34ce6187c8 -s ours am: 95ffa79af1 -s ours" into sc-dev am: 1119508d1c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14260991 Change-Id: Iff649fed55f52ab56dcd304b6fdcdb743279930c