| commit | 74ca1a54d049d83318aa5269c3139b3a1b048290 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Apr 06 00:05:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 00:05:48 2021 +0000 |
| tree | a6756ede4e6e40d837814af09925506adcff199a | |
| parent | df6ce19fa9c63053fb6f38013b06d9ffe2b8f1e6 [diff] | |
| parent | a278abb926b6c663f2e03d3e13a009b3c0d45251 [diff] |
Merge "Remove unstable IpPrefix" am: 184a6ce54d am: fdfa2d00d9 am: a278abb926 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674 Change-Id: Idfa92d12a45385412c2013637c657acfb9fec3a2
diff --git a/framework/aidl-export/android/net/IpPrefix.aidl b/framework/aidl-export/android/net/IpPrefix.aidl index 0d70f2a..3495efc 100644 --- a/framework/aidl-export/android/net/IpPrefix.aidl +++ b/framework/aidl-export/android/net/IpPrefix.aidl
@@ -18,5 +18,5 @@ package android.net; // @JavaOnlyStableParcelable only affects the parcelable when built as stable aidl (aidl_interface -// build rule). IpPrefix is also used in cpp but only as non-stable aidl. -@JavaOnlyStableParcelable parcelable IpPrefix cpp_header "binder/IpPrefix.h"; +// build rule). +@JavaOnlyStableParcelable parcelable IpPrefix;