| commit | dfa3917c27dfb502b9265100bb22bbfa76c0ed49 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Jul 22 17:54:17 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 22 17:54:17 2020 +0000 |
| tree | f8c12887bfa1fd91b5436f8ae4a3031b579d54fc | |
| parent | fa06d8c994c0e7e98a5db0412bf55fd6b73499af [diff] | |
| parent | ff2b9d5cb48a3cc43ae0adc2b3ae5060d86bc28f [diff] |
[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