diff options
author | Xin Li <delphij@google.com> | 2020-12-03 04:25:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 04:25:17 +0000 |
commit | b23c8335fb4ca07bc3ba41feafc97cecd602aedc (patch) | |
tree | 089038faa6115c34cb22e51f6821cc9c6567b2cb /src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java | |
parent | 473d8999032fe3527b505b29eee4ca85896c612a (diff) | |
parent | cec81e3030856bd9b1ec98fe99eedf91c2a8671d (diff) |
[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours
am skip reason: Change-Id Iafcefc2aa64cf3c50b1d139ec0204a315be29da7 with SHA-1 159de41477 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13122824
Change-Id: I63b84242c8f858bb3abd3d04a64ccb3e3db8d3ac
Diffstat (limited to 'src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java')
0 files changed, 0 insertions, 0 deletions