diff options
author | Xin Li <delphij@google.com> | 2020-12-03 04:39:37 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-03 04:39:37 +0000 |
commit | c7c1c6d15b3a869ea100ece4c63fb162cbcfdd2f (patch) | |
tree | 25b29b564271d441343d1306d1d2bf24e57c4d3e /src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java | |
parent | e986314b069f369243c17b7859015dbb9f12e87f (diff) | |
parent | b23c8335fb4ca07bc3ba41feafc97cecd602aedc (diff) |
[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: cec81e3030 -s ours am: b23c8335fb -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: Ibe781c52461200cffa1a43174e81a709ff9f2c8b
Diffstat (limited to 'src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java')
0 files changed, 0 insertions, 0 deletions