summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author ThiƩbaud Weksteen <tweek@google.com> 2021-12-08 04:55:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-12-08 04:55:07 +0000
commit6e8a545bff922ee6eeb5966f05321aceb72bb5fb (patch)
treefd82d5793df1c3b7335a1c0e102ecdaa6cb248bf
parent48196eafcb0910c266038a350035ae869fb0e7c0 (diff)
parente371f9ace308824e5b7ab292d8daf7b9df09dace (diff)
Merge "Add @JavaOnlyStableParcelable to AttributionSource" am: 5f5ff75870 am: 7228115341 am: e371f9ace3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1908651 Change-Id: I70718406dd94c13d39e27984c5967e1f2647bc55
-rw-r--r--core/java/android/content/AttributionSource.aidl1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/AttributionSource.aidl b/core/java/android/content/AttributionSource.aidl
index 10d5c274ae91..7554cb24b41f 100644
--- a/core/java/android/content/AttributionSource.aidl
+++ b/core/java/android/content/AttributionSource.aidl
@@ -16,4 +16,5 @@
package android.content;
+@JavaOnlyStableParcelable
parcelable AttributionSource;