diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 02:08:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 02:08:21 +0000 |
commit | 9f27b4d633a32ba5f4a0a9261e300694c80fc028 (patch) | |
tree | 226a809a856eda25cdc93edf2ac422dfa442a8bf /src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java | |
parent | 47416e4fde08a896227b14e055b8265414928b96 (diff) | |
parent | 8e913664b5939a0c601cd2b645f75889f8070462 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 448ec6b5fe -s ours am: 8e913664b5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13168703
Change-Id: Ieec85d570818e565a2d0c2bd6f4d9fe4eb5f7941
Diffstat (limited to 'src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java')
0 files changed, 0 insertions, 0 deletions