diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:06:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:06:01 +0000 |
| commit | b07d67eeaf36049d10bc3e2380ddf5ec8cea7b53 (patch) | |
| tree | c10a883e6e9e0076e3a0b16543442e538fc0e6ee /src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java | |
| parent | 8e913664b5939a0c601cd2b645f75889f8070462 (diff) | |
| parent | 7c2ed6be16b509276d3ae514bcde5159a1a9bc64 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 97bc1fcff7 -s ours am: 7c2ed6be16 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1519229
Change-Id: I719c254b4796c4dd1d53dc30e0f53d63b3e75fce
Diffstat (limited to 'src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java')
0 files changed, 0 insertions, 0 deletions