Merge "[automerger skipped] Stop crashing the system on hitting the alarm limit am: c010da3a46 am: ee9331c0d3 -s ours am: ff26f6a3b7 -s ours am: c2841d8ef1 -s ours am: 1479d4c594 -s ours am: b3f3961df2 -s ours am: 6a3dcb1f87 -s ours am: e15951e5f2 -s ours am: 904e5190a7 -s ours" into tm-d1-dev-plus-aosp am: b625dde4ef -s ours am: f238a71632 -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/+/19105069
Change-Id: Ia4a4c3de902093964bc334f7b63be81a5717089e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: