| commit | 64a1fbb8cf617978be0dc8bd9b4ce36dcb698e5e | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Thu Nov 09 22:30:31 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 09 22:30:31 2017 +0000 |
| tree | 2c1b72c9a39157b4144ab4b424dc8b615a842966 | |
| parent | 6e78c792b1570af9e18251c8ce18081ad0ea35f0 [diff] | |
| parent | b2bde067c2b0ec1f896af26ebcb97fdafa31fca3 [diff] |
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2 Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481
diff --git a/core/java/android/os/ParcelFileDescriptor.aidl b/core/java/android/os/ParcelFileDescriptor.aidl index 5857aae..6bbd99e 100644 --- a/core/java/android/os/ParcelFileDescriptor.aidl +++ b/core/java/android/os/ParcelFileDescriptor.aidl
@@ -17,4 +17,4 @@ package android.os; -parcelable ParcelFileDescriptor; +parcelable ParcelFileDescriptor cpp_header "android/os/parcel_file_descriptor.h";
diff --git a/core/java/android/os/ParcelUuid.aidl b/core/java/android/os/ParcelUuid.aidl index f7e080a..6f36297 100644 --- a/core/java/android/os/ParcelUuid.aidl +++ b/core/java/android/os/ParcelUuid.aidl
@@ -16,4 +16,4 @@ package android.os; -parcelable ParcelUuid; +parcelable ParcelUuid cpp_header "android/os/parcel_uuid.h";