summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-02-12 18:29:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-02-12 18:29:01 +0000
commitb581ab293e487b1a76542d20bd987da2a5373dcd (patch)
treee7d0bb9a13ea5f192de81b012b5d93f743b64633
parentafd14bfd44de34fb1c417ca3cafe91e463d319cb (diff)
parent2d5186b3f8685769ba0dfce47b68bc484f61af77 (diff)
Merge "Merge "Remove ParcelFileDescriptor.aidl" am: c7c7fe6325 am: 21f4e04f3d am: a1f96c0af8"
-rw-r--r--core/java/android/os/ParcelFileDescriptor.aidl20
1 files changed, 0 insertions, 20 deletions
diff --git a/core/java/android/os/ParcelFileDescriptor.aidl b/core/java/android/os/ParcelFileDescriptor.aidl
deleted file mode 100644
index c07b98055d5a..000000000000
--- a/core/java/android/os/ParcelFileDescriptor.aidl
+++ /dev/null
@@ -1,20 +0,0 @@
-/* //device/java/android/android/os/ParcelFileDescriptor.aidl
-**
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
-
-package android.os;
-
-parcelable ParcelFileDescriptor cpp_header "binder/ParcelFileDescriptor.h";