diff --git a/src/com/google/android/gms/appdatasearch/CorpusStatus.aidl b/src/com/google/android/gms/appdatasearch/CorpusStatus.aidl
new file mode 100644
index 00000000..f893aef8
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/CorpusStatus.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable CorpusStatus;
\ No newline at end of file
diff --git a/src/com/google/android/gms/appdatasearch/CorpusStatus.java b/src/com/google/android/gms/appdatasearch/CorpusStatus.java
new file mode 100644
index 00000000..99a4fd6d
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/CorpusStatus.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013-2015 µg Project Team
+ *
+ * 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 com.google.android.gms.appdatasearch;
+
+import android.os.Bundle;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class CorpusStatus extends AutoSafeParcelable {
+
+    @SafeParceled(1000)
+    private int versionCode = 2;
+    @SafeParceled(1)
+    public boolean found;
+    @SafeParceled(2)
+    public long lastIndexedSeqno;
+    @SafeParceled(3)
+    public long lastCommittedSeqno;
+    @SafeParceled(4)
+    public long committedNumDocuments;
+    @SafeParceled(5)
+    public Bundle counters;
+    @SafeParceled(6)
+    public String g;
+
+    public static final Creator<CorpusStatus> CREATOR = new AutoCreator<>(CorpusStatus.class);
+}
diff --git a/src/com/google/android/gms/appdatasearch/SuggestSpecification.aidl b/src/com/google/android/gms/appdatasearch/SuggestSpecification.aidl
new file mode 100644
index 00000000..0b3c47ff
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/SuggestSpecification.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable SuggestSpecification;
\ No newline at end of file
diff --git a/src/com/google/android/gms/appdatasearch/SuggestSpecification.java b/src/com/google/android/gms/appdatasearch/SuggestSpecification.java
new file mode 100644
index 00000000..e8433284
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/SuggestSpecification.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013-2015 µg Project Team
+ *
+ * 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 com.google.android.gms.appdatasearch;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class SuggestSpecification extends AutoSafeParcelable {
+    @SafeParceled(1000)
+    private int versionCode = 2;
+
+    public static final Creator<SuggestSpecification> CREATOR = new AutoCreator<>(SuggestSpecification.class);
+}
diff --git a/src/com/google/android/gms/appdatasearch/SuggestionResults.aidl b/src/com/google/android/gms/appdatasearch/SuggestionResults.aidl
new file mode 100644
index 00000000..57d2d63b
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/SuggestionResults.aidl
@@ -0,0 +1,3 @@
+package com.google.android.gms.appdatasearch;
+
+parcelable SuggestionResults;
\ No newline at end of file
diff --git a/src/com/google/android/gms/appdatasearch/SuggestionResults.java b/src/com/google/android/gms/appdatasearch/SuggestionResults.java
new file mode 100644
index 00000000..83818551
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/SuggestionResults.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013-2015 µg Project Team
+ *
+ * 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 com.google.android.gms.appdatasearch;
+
+import org.microg.safeparcel.AutoSafeParcelable;
+import org.microg.safeparcel.SafeParceled;
+
+public class SuggestionResults extends AutoSafeParcelable {
+    @SafeParceled(1000)
+    private int versionCode = 2;
+    @SafeParceled(1)
+    public final String errorMessage;
+
+    @SafeParceled(2)
+    public final String[] s1;
+    @SafeParceled(3)
+    public final String[] s2;
+
+    private SuggestionResults() {
+        errorMessage = null;
+        s1 = s2 = null;
+    }
+
+    public SuggestionResults(String errorMessage) {
+        this.errorMessage = errorMessage;
+        this.s1 = null;
+        this.s2 = null;
+    }
+
+    public SuggestionResults(String[] s1, String[] s2) {
+        this.errorMessage = null;
+        this.s1 = s1;
+        this.s2 = s2;
+    }
+
+    public static final Creator<SuggestionResults> CREATOR = new AutoCreator<>(SuggestionResults.class);
+}
diff --git a/src/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl b/src/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl
new file mode 100644
index 00000000..37a6a905
--- /dev/null
+++ b/src/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl
@@ -0,0 +1,10 @@
+package com.google.android.gms.appdatasearch.internal;
+
+import com.google.android.gms.appdatasearch.CorpusStatus;
+import com.google.android.gms.appdatasearch.SuggestionResults;
+import com.google.android.gms.appdatasearch.SuggestSpecification;
+
+interface IAppDataSearch {
+    SuggestionResults getSuggestions(String var1, String packageName, in String[] accounts, int maxNum, in SuggestSpecification specs) = 1;
+    CorpusStatus getStatus(String packageName, String accountName) = 4;
+}