tree 7946660d42987a7e143d41eb516a33dc8500f111
parent 036d89cd7d6b54b1c55b54346e966b5cab77ac80
parent 16402fc4c3aa3d4b4ecf3e008177bce275270437
author Woody Lin <woodylin@google.com> 1602746933 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602746933 +0000

Merge "Watchdog: break timeout loop via system fatal crash" am: 16402fc4c3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316216

Change-Id: I4882c0f7ea80efbba52514cdc9e13e627a735dfd