Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"

am: b2bde067c2 Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481
2017-11-09 22:30:31 +00:00
parent 6e78c792b1 b2bde067c2
commit 64a1fbb8cf
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";