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