commit | 08407fefe5fabf8ec6ba7b057092a54f2c4da63c | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Wed Jul 22 18:12:24 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 22 18:12:24 2020 +0000 |
tree | c1657adbb57c5a278596ddc583a251250f70c0ab | |
parent | 5fee124a21d84acbc76dea1adb43a2a995d2573b [diff] | |
parent | dfa3917c27dfb502b9265100bb22bbfa76c0ed49 [diff] |
[automerger skipped] Merge "Remove the watchdog's fd tracker." am: 4a724fc1ee am: ff2b9d5cb4 -s ours am: dfa3917c27 -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: I42e9c55d7d046e1455fc9a97a4e2e933f5a28e03