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