summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Thomas Stuart <tjstuart@google.com> 2024-10-10 21:07:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-10 21:07:39 +0000
commitc8017731f6dbcce4bf698b6042cad903d753ece5 (patch)
treec8dd8df921e605c22db02109f913e93233e028c0 /libs/androidfw/AssetsProvider.cpp
parent32cc4f318f41bdab150660f1fc4ee4a847dda4b0 (diff)
parent2cbd2545bd7c3425fa2ebc5a11aed4dbed155afe (diff)
[automerger skipped] Merge "enforce limits for VisualVoicemailSmsFilterSettings properties" into sc-dev am: e6a2cfe5d7 am: 8a8d5d4c4f am: 208fb853f6 am: 352b6e2f41 am: 9122b72c41 -s ours am: 2cbd2545bd -s ours
am skip reason: Merged-In Id4b4358b141bb211a7e340b979774850b4bd2403 with SHA-1 b5df56f2e1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27975021 Change-Id: Ic69ab6f43c5acf10161d75c01f14bd43948ef7a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions