summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-08-15 00:25:54 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-08-15 00:25:54 -0700
commitb03fdd4dcf981e8948fef1d62f1568674ae04e08 (patch)
tree9d8627de191dcc07ad558d39d8d49c88b986ad9a /src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
parentf8c25b6ac43da400b9bad8f790c6a6b7484ab08c (diff)
parent1e53efc4c48ec80421bb0542b770332ab8efdab5 (diff)
downloadpackages_apps_Settings-b03fdd4dcf981e8948fef1d62f1568674ae04e08.tar.gz
packages_apps_Settings-b03fdd4dcf981e8948fef1d62f1568674ae04e08.tar.bz2
packages_apps_Settings-b03fdd4dcf981e8948fef1d62f1568674ae04e08.zip
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
am: 1e53efc4c4 -s ours am skip reason: subject contains skip directive Change-Id: I1898ca933b111068bd8b7eafbe5421096c313d9e
Diffstat (limited to 'src/com/android/settings/connecteddevice/AddDevicePreferenceController.java')
0 files changed, 0 insertions, 0 deletions