diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-11-09 23:04:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-11-09 23:04:28 +0000 |
| commit | 874ab0ef2109b90be15979e41c7c0641ad872394 (patch) | |
| tree | b255c371cae2f195c657f098608c8be4cf93378e /core/java/android | |
| parent | 4a734916f16ada8cad3ae11365789953bde0f1b9 (diff) | |
| parent | 64a1fbb8cf617978be0dc8bd9b4ce36dcb698e5e (diff) | |
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067c2
am: 64a1fbb8cf
Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/ParcelFileDescriptor.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/os/ParcelUuid.aidl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/ParcelFileDescriptor.aidl b/core/java/android/os/ParcelFileDescriptor.aidl index 5857aae5c599..6bbd99e3f20a 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 f7e080ac5901..6f3629796bde 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"; |