diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-06 17:20:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 17:20:44 +0000 |
commit | 403e0ce867685de6019b4d0d5622cc6cc6b4718a (patch) | |
tree | cb9bc42d47af65c3ddb4a902dbe26ec6cddef1a9 /src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java | |
parent | 2c2a56b7cc009d3d4cb6178a5520fc690feec8b8 (diff) | |
parent | 9f9300d38b0e35e8ba118d03f1e964db2264d823 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e5350c9e20 -s ours am: 9f9300d38b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13174152
Change-Id: I476255b5f59d5b8014a345dcc39a1ae5d51271b6
Diffstat (limited to 'src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java')
0 files changed, 0 insertions, 0 deletions