summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorXiao Ma <xiaom@google.com>2019-12-05 00:42:35 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-05 00:42:35 -0800
commit4ff3397343f7601d79a7173cbfd399f1480bbd7c (patch)
treea1ed6bc3b894298a39a9a4c6c86fcf278688a68f /core/java
parent1a88f1745b3180531d49c9e42835cf634bc9a316 (diff)
parent9b115791e51359f2eeba8a2e57afca99831977b6 (diff)
Merge "Add DHCP Rapid Commit FILS support." am: 488c2b03d7 am: 2000a1410f
am: 9b115791e5 Change-Id: I6e782e27e195d81e14269e12f715dce92052e604
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/MacAddress.aidl20
1 files changed, 20 insertions, 0 deletions
diff --git a/core/java/android/net/MacAddress.aidl b/core/java/android/net/MacAddress.aidl
new file mode 100644
index 000000000000..48a18a7ac821
--- /dev/null
+++ b/core/java/android/net/MacAddress.aidl
@@ -0,0 +1,20 @@
+/**
+ *
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.net;
+
+@JavaOnlyStableParcelable parcelable MacAddress;