summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/ButtonPreference
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2022-06-22 10:19:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-22 10:19:33 +0000
commitbe6a5af2a7408796fc424bc8e4c8f10d64c2d52d (patch)
tree1cd7a0ce4b1f05c0d992ddbf7dc00e6b672e1b3d /packages/SettingsLib/ButtonPreference
parentdbfeb05af7218eb6110d42542f72799d171dd2d2 (diff)
parent096fd33c857484162a72e4abc315d632a97a70fb (diff)
[automerger skipped] Merge changes from topic "cherrypicker-L33200000955045139:N22000001272520181" into tm-qpr-dev am: 0a431804fa -s ours am: 096fd33c85 -s ours
am skip reason: Merged-In If0fe30f0b98b83a723e14ea8f6cd9a96c54e1691 with SHA-1 b4e39c87c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18825270 Change-Id: I2149653e1f5c53374fac172051a6963bfcec5dc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'packages/SettingsLib/ButtonPreference')
0 files changed, 0 insertions, 0 deletions