[automerger skipped] [automerge] Stop crashing the system on hitting the alarm limit 2p: 87fd506129 am: b7d6952de7 -s ours am: 2dac8d1d85 -s ours
am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d27564 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19109495
Change-Id: Ica3af700b0a070bf13e192dc1f9a98b2c5eb1345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: