summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/ButtonPreference
diff options
context:
space:
mode:
author Lorenzo Colitti <lorenzo@google.com> 2022-06-22 10:18:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-22 10:18:20 +0000
commit096fd33c857484162a72e4abc315d632a97a70fb (patch)
treeb2a71c1124a94638143bf9539d0a875524a0c6b3 /packages/SettingsLib/ButtonPreference
parent9a1d5c8620097b2ff99ec5c0e55dcba71f135863 (diff)
parent0a431804faa61bd9d0ae86da29172b7ac1069094 (diff)
[automerger skipped] Merge changes from topic "cherrypicker-L33200000955045139:N22000001272520181" into tm-qpr-dev am: 0a431804fa -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: Ic9dac8391edd7f61b18d093d9a30614d2c4d1078 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