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