diff options
| author | 2022-07-22 07:46:58 +0000 | |
|---|---|---|
| committer | 2022-07-22 07:46:58 +0000 | |
| commit | 6cdb37f43646ed22bf87b13e7dbe802fc0a2a69e (patch) | |
| tree | 8072be41b09c0e184346842e0b6f759198af57ef /libs/androidfw/ResourceTimer.cpp | |
| parent | 723a48560ffc1802508732b141abc1f5314b7376 (diff) | |
| parent | c6d3949eaa7eb1f9b9d8d13f845c5f28b2d07f2c (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: a58cd3bea7 -s ours am: c6d3949eaa -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: I6462434bd4addc0e51cdbfee5cc674baefa87a60
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