summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Suprabh Shukla <suprabh@google.com> 2022-07-22 07:46:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-22 07:46:14 +0000
commit2bb7dbd6ed3a6d8b5a818ca63283d16a4e17ae35 (patch)
tree8072be41b09c0e184346842e0b6f759198af57ef /libs/androidfw/ResourceTimer.cpp
parentfd6192aee1a17de4259dc674cd9bdc4c090a03d2 (diff)
parente5e34dc8c8227f395a415d546b0196817ea83a4d (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: ef65df9223 -s ours am: d4387bc62a -s ours am: 75542b97d6 -s ours am: 2cf203a185 -s ours am: 7362a977cf -s ours am: e5e34dc8c8 -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: I557c5497caae82293f20355a43ce37e08f6160fa 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