summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2022-07-22 07:18:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-22 07:18:12 +0000
commit84d7038605e679219fc63c8304b834c50f49996f (patch)
tree27d076fe8d477e406a13d8d53082b28e4505ca5e /libs/androidfw/ResourceTimer.cpp
parent24f5129a740c30d29720405bef08ed84bf0a5099 (diff)
parent8b29c0e7216848601941430ed8f613a07c3dd7a5 (diff)
[automerger skipped] Merge "Stop crashing the system on hitting the alarm limit" into rvc-dev am: da44101e4f -s ours am: 566f694615 -s ours am: 0ded155f96 -s ours am: 1b5540e074 -s ours am: 4fd7462388 -s ours am: a6da198cb6 -s ours am: 8b29c0e721 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 c010da3a46 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19350124 Change-Id: I6343f926616312eedcdccf64481192200d4005fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions