diff options
| author | 2022-07-22 07:48:04 +0000 | |
|---|---|---|
| committer | 2022-07-22 07:48:04 +0000 | |
| commit | 0aa7e12ecbee3f2d46dbb92d744937d1bd4ef4e0 (patch) | |
| tree | 8072be41b09c0e184346842e0b6f759198af57ef /libs/androidfw/ResourceTimer.cpp | |
| parent | 3f6a9508ee2f43633de9f3591e8d43099d2af16c (diff) | |
| parent | 118476990e18d3f877b3ce3d71a7a1467e54c19a (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: 4682c3ec5b -s ours am: 118476990e -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: I4081c316085d0d1904a935698d657d25045f9eb5
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