tree 25ba5d14f9743f84d09b2d35b7b6dc26ef8f1586
parent 2cc875293556b87cad330c08db34d42de3f6de0e
parent 3e9b69bf777ab5526c14c30d52328bbaa762c1ef
author Bernie Innocenti <codewiz@google.com> 1553832934 -0700
committer android-build-merger <android-build-merger@google.com> 1553832934 -0700

Merge "Fix bogus error checking on unique_fd" am: 95587b085e
am: 3e9b69bf77

Change-Id: Id54116718b97057f978e1410a96bfb449999f832