tree 7433ec86264e77fb54a5d432c73d89f3297134bf
parent 9830b28db1eff430a9226e48d6ebdc371b1aacce
parent c9f7253224ddd4aeb3f2c190f02f638e992c2e01
author Junyu Lai <junyulai@google.com> 1597122885 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597122885 +0000

[automerger skipped] Merge "Fix fd leak in KeepaliveTracker." into rvc-d1-dev am: c9f7253224 -s ours

am skip reason: Change-Id Ice9fc9abe2959a84ad138a95c900dff676653665 with SHA-1 a67198dbfd is in history

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

Change-Id: Ie4999416cdf9e3a05f3193e3402eae3129481703