summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2023-09-06 01:00:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-06 01:00:13 +0000
commit59de251346e611b776cc071cce98e4858c86e65e (patch)
tree3c0844d44a23deaa58664fdebc3e44dcaf738d8d /libs/androidfw/BackupData.cpp
parentea7653b0f8891b4b8c00c35082ba1f76c91225be (diff)
parent6718ed86a8ec4756dfdbe7f2624f08d9f84e9551 (diff)
[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d316 am: e8f41307f6 am: 25b8fa5e7d -s ours am: d92dacc7eb -s ours am: 6718ed86a8 -s ours
am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 dd044a6cad is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248 Change-Id: Ia1769a54cbeef5e95c0cce493b7dad909937583a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions