Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2

am: 64a1fbb8cf Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae
2017-11-09 23:04:28 +00:00
parent 4a734916f1 64a1fbb8cf
commit 874ab0ef21
2 changed files with 2 additions and 2 deletions
--- 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";
--- 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";