tree 8358240d23f47ffe20dc0d0fe397fd07559da0de
parent b2432b2ab3b2294bc6e34d9e0dafbdded0b70f71
parent 46331602ae6360faa872b9dec7dc43a6e48151b0
author Jeff Sharkey <jsharkey@android.com> 1533770044 -0700
committer android-build-merger <android-build-merger@google.com> 1533770044 -0700

Merge "Shuffle FD ownership?  \noideadog"
am: 46331602ae

Change-Id: I30e937d0a28361a8e12e9197ef38b0ca8c3840d7