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

Browse Source

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: I42e9c55d7d046e1455fc9a97a4e2e933f5a28e03

...

This commit is contained in:

Elliott Hughes

2020-07-22 18:12:24 +00:00

committed by Automerger Merge Worker

parent 5fee124a21 dfa3917c27

commit 08407fefe5

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available