[automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -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: I582872307553ad85854541cf42e684ba7712917b
This commit is contained in:
Elliott Hughes
2020-07-22 17:54:17 +00:00
committed by Automerger Merge Worker

Diff Content Not Available