tree 0aab143073f561f71dde292e8cff303555fb7b5e
parent 7bc03c23d01c0035ec936efdec211e8d32c28a38
parent f8f1f2caa0cc9d4ff9941a9ba112f1da46cf08aa
author Elliott Hughes <enh@google.com> 1595444131 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595444131 +0000

[automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -s ours am: dfa3917c27 -s ours am: 08407fefe5 -s ours am: f8f1f2caa0 -s ours

am skip reason: Change-Id I86436f287d0e25d1dfae95b915beb78c88dccce2 with SHA-1 7adf08740f is in history

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

Change-Id: I0b79c082a260fee67537c307cd888b99ea4c693c