summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Julia Reynolds <juliacr@google.com> 2022-07-19 17:40:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-19 17:40:23 +0000
commit1d3bfdf22761051dece50600f52a94c7a31d6afd (patch)
tree3bc5f105b7adfe5320f45a4eaa29b11397115420 /libs/androidfw/AssetsProvider.cpp
parent85c337609450eaef5cf34b424830bc148a5b6850 (diff)
parent6e8239cd82812553a747848f7b7518965828b20e (diff)
[automerger skipped] Merge "Limit the number of concurrently snoozed notifications" into sc-qpr1-dev am: 06de215791 -s ours am: 40ffa103b9 -s ours am: 6e8239cd82 -s ours
am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 e61de0648a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205945 Change-Id: I546d86b27f63e195900695e7ca560c948edf028f 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