tree 099332117326d093d2990037eddc0014601d70b6
parent 7a07e39801a6bf1d4c1e35017da80a44ee4a343f
parent dcc5575f9bb028ef3e64be52190b7f1abbbdf459
author Christopher Wiley <wiley@google.com> 1461001931 +0000
committer android-build-merger <android-build-merger@google.com> 1461001931 +0000

Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd""
am: dcc5575

* commit 'dcc5575f9bb028ef3e64be52190b7f1abbbdf459':
  Revert "libbinder: Replace ScopedFd with base::unique_fd"

Change-Id: I97e6ec2cb96f511a4dcf9fadec6e9567fc053f0c