Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c411b3d4 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by android-build-merger
Browse files

Merge changes from topics "parcel_uuid_and_fd_native",... 

Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067 am: 64a1fbb8
am: 874ab0ef

Change-Id: Ib5b30de21a15ee6220ad4aa143216fb10839d709
parents 5cc4679d 874ab0ef

core/java/android/os/ParcelFileDescriptor.aidl

+1 −1
Original line number Diff line number Diff line
@@ -17,4 +17,4 @@ 


package android.os;



parcelable ParcelFileDescriptor;
 
parcelable ParcelFileDescriptor cpp_header "android/os/parcel_file_descriptor.h";

core/java/android/os/ParcelUuid.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,4 +16,4 @@ 


package android.os;



parcelable ParcelUuid;
 
parcelable ParcelUuid cpp_header "android/os/parcel_uuid.h";