OSDN Git Service

Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am: dcc5575
authorChristopher Wiley <wiley@google.com>
Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
commit0cbee9f0f87841e77f6c4b2449cdd1a472da2982
tree9f6e0b0f59c53824428054fb80828b5ce94c08c7
parent7f38c4b9d84c0aa84017b8e211de416d7467cbb6
parent1c585692a37eef2d28e01db451879f7f53dc97a1
Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am: dcc5575
am: 1c58569

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

Change-Id: Iae20ab4fac161b0785b011b42353ebf46de1c59a
include/binder/Parcel.h
libs/binder/Android.mk
libs/binder/Parcel.cpp