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

Commit 874ab0ef authored Nov 09, 2017 by Jakub Pawlowski Committed by android-build-merger Nov 09, 2017

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

Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae

parents 4a734916 64a1fbb8

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";