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