tree 9f6db96938a009067b05d4fa5db9f2cd9eca9d13
parent c378a0cc07706b3ac570554c24b85cf8f6962278
parent 48547ce1d0e5cebed350b6c0aebcbe49a301357e
author Jeffrey Vander Stoep <jeffv@google.com> 1569874037 -0700
committer android-build-merger <android-build-merger@google.com> 1569874037 -0700

Merge "Fix FD leak in ConnectivityManager.getConnectionOwnerUid" am: 20bdc26698 am: 0b6d974713
am: 48547ce1d0

Change-Id: I1a4788243caac0ef9095da134438813b1caf5a24