tree 1eab5fa75faeb078061595dc8660e47dc0df965f
parent a9d3817d69ab869c7ad99b815b123cf86e831558
parent f3ced351f04b6f5e02f2eb2af4567c0fbf6756c5
author Lorenzo Colitti <lorenzo@google.com> 1596781020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596781020 +0000

Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 am: f3ced351f0

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

Change-Id: I69f4f8073b057f294e0665ab7b1dcf57818d3089