tree d15e178a6690a7b8cb2d57e1f01b269ea2cb9bab
parent 0bfc7ad39295ba4802e54f27516564de78e896b9
parent 93e0ec070a4ee0f625a5e0e9349c303f3b05da56
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: c6a527351f am: 759c08d0f4 am: 93e0ec070a

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

Change-Id: I69f4f8073b057f294e0665ab7b1dcf57818d3089