diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:38:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:38:51 +0000 |
commit | 11b0105b984382b4566e965fec932f95c430cf3b (patch) | |
tree | 47d05b06663edf8ee117235009d3b7551f033724 /src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java | |
parent | e5350c9e20a7d9bfee8e5fbcda181dec69ac06ca (diff) | |
parent | 4d181cc04f59f5a4f1d9e79c8dcb797c6b4759ca (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d181cc04f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1518870
Change-Id: Iafacdf7b241ac8c7f4aa65861f885868bc4578dc
Diffstat (limited to 'src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java')
0 files changed, 0 insertions, 0 deletions