summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2022-07-22 07:45:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-22 07:45:14 +0000
commitd43105068340b7e1240a329068318c5bf4d5a9c1 (patch)
tree8072be41b09c0e184346842e0b6f759198af57ef /libs/androidfw/ResourceTimer.cpp
parent288f5d1a783c893d8ecd655c99c83c4238a36127 (diff)
parent84d7038605e679219fc63c8304b834c50f49996f (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: 84d7038605 -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: I3fd72fd10b478bc32bab0d7d59d4768409563768 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