diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle
index f0caf02f..fe05a441 100644
--- a/play-services-base/build.gradle
+++ b/play-services-base/build.gradle
@@ -1,25 +1,41 @@
+/*
+ * Copyright 2013-2015 microG 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.
+ */
+
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-dependencies {
-    compile 'com.android.support:support-v4:22.0.0'
-    compile project(':play-services-api')
-}
-
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }
 }
+
+dependencies {
+    compile 'com.android.support:support-v4:23.0.1'
+    compile project(':play-services-api')
+}
diff --git a/play-services-base/src/main/AndroidManifest.xml b/play-services-base/src/main/AndroidManifest.xml
index d3685676..8b7acc02 100644
--- a/play-services-base/src/main/AndroidManifest.xml
+++ b/play-services-base/src/main/AndroidManifest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013-2015 microG 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.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.gms">
 
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/ConnectionResult.java b/play-services-base/src/main/java/com/google/android/gms/common/ConnectionResult.java
index 155f0508..dbd87044 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/ConnectionResult.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/ConnectionResult.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common;
 
 import android.app.Activity;
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesClient.java b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesClient.java
index 9796592f..b9cece5c 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesClient.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesClient.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common;
 
 import android.os.Bundle;
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java
index 01499aec..faaa6adc 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common;
 
 import android.app.Activity;
@@ -20,7 +36,6 @@ import org.microg.gms.common.PublicApi;
  * TODO: methods :)
  */
 public class GooglePlayServicesUtil {
-    @PublicApi(exclude = true)
     private static final String TAG = "GooglePlayServicesUtil";
 
     public static final String GMS_ERROR_DIALOG = "GooglePlayServicesErrorDialog";
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/Api.java b/play-services-base/src/main/java/com/google/android/gms/common/api/Api.java
index 60ab9a36..8a55af20 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/Api.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/Api.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common.api;
 
 import org.microg.gms.common.PublicApi;
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java b/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java
index e44f988e..c3e44885 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common.api;
 
 import android.app.Activity;
@@ -222,10 +238,10 @@ public interface GoogleApiClient {
     @PublicApi
     public class Builder {
         private final Context context;
-        private final Map<Api, Api.ApiOptions> apis = new HashMap<>();
-        private final Set<ConnectionCallbacks> connectionCallbacks = new HashSet<>();
-        private final Set<OnConnectionFailedListener> connectionFailedListeners = new HashSet<>();
-        private final Set<String> scopes = new HashSet<>();
+        private final Map<Api, Api.ApiOptions> apis = new HashMap<Api, Api.ApiOptions>();
+        private final Set<ConnectionCallbacks> connectionCallbacks = new HashSet<ConnectionCallbacks>();
+        private final Set<OnConnectionFailedListener> connectionFailedListeners = new HashSet<OnConnectionFailedListener>();
+        private final Set<String> scopes = new HashSet<String>();
         private String accountName;
         private int clientId = -1;
         private FragmentActivity fragmentActivity;
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java b/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java
index 575fc791..28943f18 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common.api;
 
 import java.util.concurrent.TimeUnit;
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/Releasable.java b/play-services-base/src/main/java/com/google/android/gms/common/api/Releasable.java
index ed3d08c6..6856634a 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/Releasable.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/Releasable.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common.api;
 
 /**
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/api/ResultCallback.java b/play-services-base/src/main/java/com/google/android/gms/common/api/ResultCallback.java
index 08335d5b..4695dbcb 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/api/ResultCallback.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/api/ResultCallback.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.common.api;
 
 /**
diff --git a/play-services-base/src/main/java/com/google/android/gms/common/data/DataBuffer.java b/play-services-base/src/main/java/com/google/android/gms/common/data/DataBuffer.java
index 0d406cbd..485e7bc9 100644
--- a/play-services-base/src/main/java/com/google/android/gms/common/data/DataBuffer.java
+++ b/play-services-base/src/main/java/com/google/android/gms/common/data/DataBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/com/google/android/gms/gcm/GoogleCloudMessaging.java b/play-services-base/src/main/java/com/google/android/gms/gcm/GoogleCloudMessaging.java
index 91f00fd5..b867ae7a 100644
--- a/play-services-base/src/main/java/com/google/android/gms/gcm/GoogleCloudMessaging.java
+++ b/play-services-base/src/main/java/com/google/android/gms/gcm/GoogleCloudMessaging.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionCallbacks.java b/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionCallbacks.java
index e38972ff..62497285 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionCallbacks.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionCallbacks.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionFailedListener.java b/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionFailedListener.java
index 823a1991..9645b957 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionFailedListener.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionFailedListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/GmsClient.java b/play-services-base/src/main/java/org/microg/gms/common/GmsClient.java
index 80bf78cf..2d88a881 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/GmsClient.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/GmsClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/GmsConnector.java b/play-services-base/src/main/java/org/microg/gms/common/GmsConnector.java
index 3621f8ec..efb66edd 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/GmsConnector.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/GmsConnector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ public class GmsConnector<C extends ApiConnection, R extends Result, O extends A
         Log.d(TAG, "connect()");
         apiClient.getApiConnection(api);
         Looper looper = apiClient.getLooper();
-        final AbstractPendingResult<R> result = new AbstractPendingResult<>(looper);
+        final AbstractPendingResult<R> result = new AbstractPendingResult<R>(looper);
         Message msg = new Message();
         msg.obj = result;
         new Handler(looper).sendMessage(msg);
diff --git a/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java b/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java
index d88bc5ed..75b34039 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ public class MultiConnectionKeeper {
     private static MultiConnectionKeeper INSTANCE;
 
     private final Context context;
-    private final Map<String, Connection> connections = new HashMap<>();
+    private final Map<String, Connection> connections = new HashMap<String, Connection>();
 
     public MultiConnectionKeeper(Context context) {
         this.context = context;
@@ -83,7 +83,7 @@ public class MultiConnectionKeeper {
 
     public class Connection {
         private final String actionString;
-        private final Set<ServiceConnection> connectionForwards = new HashSet<>();
+        private final Set<ServiceConnection> connectionForwards = new HashSet<ServiceConnection>();
         private boolean bound = false;
         private boolean connected = false;
         private IBinder binder;
diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPendingResult.java b/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPendingResult.java
index 7986adff..013cc8d3 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPendingResult.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPendingResult.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPlayServicesClient.java b/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPlayServicesClient.java
index 50fd1bc3..32d817da 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPlayServicesClient.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPlayServicesClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/ApiBuilder.java b/play-services-base/src/main/java/org/microg/gms/common/api/ApiBuilder.java
index 4ffffebe..b20899df 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/api/ApiBuilder.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/api/ApiBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/ApiConnection.java b/play-services-base/src/main/java/org/microg/gms/common/api/ApiConnection.java
index 77c9af9d..019ea5d8 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/api/ApiConnection.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/api/ApiConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java b/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java
index db0c707e..b47982ca 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,11 +42,11 @@ public class GoogleApiClientImpl implements GoogleApiClient {
     private final Context context;
     private final Looper looper;
     private final AccountInfo accountInfo;
-    private final Map<Api, Api.ApiOptions> apis = new HashMap<>();
-    private final Map<Api, ApiConnection> apiConnections = new HashMap<>();
+    private final Map<Api, Api.ApiOptions> apis = new HashMap<Api, Api.ApiOptions>();
+    private final Map<Api, ApiConnection> apiConnections = new HashMap<Api, ApiConnection>();
     private final Handler handler;
-    private final Set<ConnectionCallbacks> connectionCallbacks = new HashSet<>();
-    private final Set<OnConnectionFailedListener> connectionFailedListeners = new HashSet<>();
+    private final Set<ConnectionCallbacks> connectionCallbacks = new HashSet<ConnectionCallbacks>();
+    private final Set<OnConnectionFailedListener> connectionFailedListeners = new HashSet<OnConnectionFailedListener>();
     private final int clientId;
     private final ConnectionCallbacks baseConnectionCallbacks = new ConnectionCallbacks() {
         @Override
diff --git a/play-services-base/src/main/java/org/microg/gms/common/api/ResultCallbackHandler.java b/play-services-base/src/main/java/org/microg/gms/common/api/ResultCallbackHandler.java
index 0c03a57b..071a6d74 100644
--- a/play-services-base/src/main/java/org/microg/gms/common/api/ResultCallbackHandler.java
+++ b/play-services-base/src/main/java/org/microg/gms/common/api/ResultCallbackHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-base/src/main/res/values/version.xml b/play-services-base/src/main/res/values/version.xml
index 096db2c0..aca0d060 100644
--- a/play-services-base/src/main/res/values/version.xml
+++ b/play-services-base/src/main/res/values/version.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright 2014-2015 µg Project Team
+  ~ Copyright 2013-2015 microG Project Team
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle
index 041610d5..be40ce7f 100644
--- a/play-services-location/build.gradle
+++ b/play-services-location/build.gradle
@@ -1,24 +1,40 @@
+/*
+ * Copyright 2013-2015 microG 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.
+ */
+
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-dependencies {
-    compile project(':play-services-base')
-}
-
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }
 }
+
+dependencies {
+    compile project(':play-services-base')
+}
\ No newline at end of file
diff --git a/play-services-location/src/main/AndroidManifest.xml b/play-services-location/src/main/AndroidManifest.xml
index 32fad327..79a62e35 100644
--- a/play-services-location/src/main/AndroidManifest.xml
+++ b/play-services-location/src/main/AndroidManifest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013-2015 microG 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.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.microg.gms.location">
 
diff --git a/play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java b/play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java
index 8c484537..572a6ae1 100644
--- a/play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java
+++ b/play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.location;
 
 import android.app.PendingIntent;
@@ -10,26 +26,26 @@ import com.google.android.gms.common.api.PendingResult;
 import org.microg.gms.common.Constants;
 
 public interface FusedLocationProviderApi {
-    public static final String KEY_LOCATION_CHANGED = "com.google.android.location.LOCATION";
-    public static final String KEY_MOCK_LOCATION = Constants.KEY_MOCK_LOCATION;
+    String KEY_LOCATION_CHANGED = "com.google.android.location.LOCATION";
+    String KEY_MOCK_LOCATION = Constants.KEY_MOCK_LOCATION;
 
-    public Location getLastLocation(GoogleApiClient client);
+    Location getLastLocation(GoogleApiClient client);
 
-    public PendingResult requestLocationUpdates(GoogleApiClient client, LocationRequest request,
-            LocationListener listener);
+    PendingResult requestLocationUpdates(GoogleApiClient client, LocationRequest request,
+                                         LocationListener listener);
 
-    public PendingResult requestLocationUpdates(GoogleApiClient client, LocationRequest request,
-            LocationListener listener, Looper looper);
+    PendingResult requestLocationUpdates(GoogleApiClient client, LocationRequest request,
+                                         LocationListener listener, Looper looper);
 
-    public PendingResult requestLocationUpdates(GoogleApiClient client, LocationRequest request,
-            PendingIntent callbackIntent);
+    PendingResult requestLocationUpdates(GoogleApiClient client, LocationRequest request,
+                                         PendingIntent callbackIntent);
 
-    public PendingResult removeLocationUpdates(GoogleApiClient client, LocationListener listener);
+    PendingResult removeLocationUpdates(GoogleApiClient client, LocationListener listener);
 
-    public PendingResult removeLocationUpdates(GoogleApiClient client,
-            PendingIntent callbackIntent);
+    PendingResult removeLocationUpdates(GoogleApiClient client,
+                                        PendingIntent callbackIntent);
 
-    public PendingResult setMockMode(GoogleApiClient client, boolean isMockMode);
+    PendingResult setMockMode(GoogleApiClient client, boolean isMockMode);
 
-    public PendingResult setMockLocation(GoogleApiClient client, Location mockLocation);
+    PendingResult setMockLocation(GoogleApiClient client, Location mockLocation);
 }
diff --git a/play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java b/play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java
index fe2f8762..b2b581bf 100644
--- a/play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java
+++ b/play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.location;
 
 public interface GeofencingApi {
diff --git a/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java
index b9df6c40..ae75d4c0 100644
--- a/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java
+++ b/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.location;
 
 import android.app.PendingIntent;
diff --git a/play-services-location/src/main/java/com/google/android/gms/location/LocationListener.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationListener.java
index 86fedc42..805b543a 100644
--- a/play-services-location/src/main/java/com/google/android/gms/location/LocationListener.java
+++ b/play-services-location/src/main/java/com/google/android/gms/location/LocationListener.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.location;
 
 import android.location.Location;
diff --git a/play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java
index 5dddd2b4..dc575bb9 100644
--- a/play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java
+++ b/play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2013-2015 microG 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.location;
 
 import com.google.android.gms.common.api.Api;
@@ -10,9 +26,7 @@ import org.microg.gms.location.LocationServicesApiBuilder;
  * The main entry point for location services integration.
  */
 public class LocationServices {
-    public static final Api<Api.ApiOptions.NoOptions> API = new Api<>(new
-            LocationServicesApiBuilder());
-    public static final FusedLocationProviderApi FusedLocationApi = new
-            FusedLocationProviderApiImpl();
+    public static final Api<Api.ApiOptions.NoOptions> API = new Api<Api.ApiOptions.NoOptions>(new LocationServicesApiBuilder());
+    public static final FusedLocationProviderApi FusedLocationApi = new FusedLocationProviderApiImpl();
     public static final GeofencingApi GeofencingApi = new GeofencingApiImpl();
 }
diff --git a/play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java b/play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java
index 08e90c5b..a9d6bf12 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import android.os.Looper;
 import android.os.RemoteException;
 import android.util.Log;
 
+import com.google.android.gms.common.api.Api;
 import com.google.android.gms.common.api.GoogleApiClient;
 import com.google.android.gms.common.api.PendingResult;
 import com.google.android.gms.common.api.Result;
@@ -124,7 +125,7 @@ public class FusedLocationProviderApiImpl implements FusedLocationProviderApi {
     }
 
     private PendingResult callVoid(GoogleApiClient client, final Runnable runnable) {
-        return new GmsConnector<>(client, LocationServices.API,
+        return new GmsConnector<LocationClientImpl, Result, Api.ApiOptions.NoOptions>(client, LocationServices.API,
                 new GmsConnector.Callback<LocationClientImpl, Result>() {
                     @Override
                     public Result onClientAvailable(LocationClientImpl client) throws
diff --git a/play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java b/play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java
index 81fcfdc7..7b6512b0 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java
index 68f8d4c9..aab38b0d 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java b/play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java
index a79e0c62..e3593198 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import java.util.Map;
 public class LocationClientImpl extends GoogleLocationManagerClient {
     private static final String TAG = "GmsLocationClientImpl";
     private NativeLocationClientImpl nativeLocation = null;
-    private Map<LocationListener, ILocationListener> listenerMap = new HashMap<>();
+    private Map<LocationListener, ILocationListener> listenerMap = new HashMap<LocationListener, ILocationListener>();
 
 
     public LocationClientImpl(Context context, GoogleApiClient.ConnectionCallbacks callbacks,
diff --git a/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiBuilder.java b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiBuilder.java
index 6876e630..218feebd 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiBuilder.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java
index 5129c19f..500e5e05 100644
--- a/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java
+++ b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,15 +35,15 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class NativeLocationClientImpl {
-    private final static String TAG = "GmsToNativeLocationClient";
+    private final static String TAG = "GmsToNativeLocClient";
     private final static Criteria DEFAULT_CRITERIA = new Criteria();
-    private final static Map<PendingIntent, Integer> pendingCount = new HashMap<>();
-    private final static Map<PendingIntent, PendingIntent> nativePendingMap = new HashMap<>();
+    private final static Map<PendingIntent, Integer> pendingCount = new HashMap<PendingIntent, Integer>();
+    private final static Map<PendingIntent, PendingIntent> nativePendingMap = new HashMap<PendingIntent, PendingIntent>();
     private static final String EXTRA_PENDING_INTENT = "pending_intent";
 
     private final Context context;
     private final LocationManager locationManager;
-    private final Map<LocationListener, NativeListener> nativeListenerMap = new HashMap<>();
+    private final Map<LocationListener, NativeListener> nativeListenerMap = new HashMap<LocationListener, NativeListener>();
 
     public NativeLocationClientImpl(LocationClientImpl client) {
         context = client.getContext();
diff --git a/play-services-wearable/build.gradle b/play-services-wearable/build.gradle
index 041610d5..2d7747bc 100644
--- a/play-services-wearable/build.gradle
+++ b/play-services-wearable/build.gradle
@@ -1,24 +1,40 @@
+/*
+ * Copyright 2013-2015 microG 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.
+ */
+
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
-        classpath 'com.github.dcendents:android-maven-plugin:1.2'
+        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-dependencies {
-    compile project(':play-services-base')
-}
-
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_6
     }
 }
+
+dependencies {
+    compile project(':play-services-base')
+}
diff --git a/play-services-wearable/src/main/AndroidManifest.xml b/play-services-wearable/src/main/AndroidManifest.xml
index 33723d79..bb22a334 100644
--- a/play-services-wearable/src/main/AndroidManifest.xml
+++ b/play-services-wearable/src/main/AndroidManifest.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013-2015 microG 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.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.microg.gms.wearable">
 
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataApi.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataApi.java
index 25ef04bc..fffa4079 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataApi.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import com.google.android.gms.common.api.PendingResult;
 import com.google.android.gms.common.api.Result;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.common.data.Freezable;
+import com.google.android.gms.wearable.internal.PutDataRequest;
 
 import org.microg.gms.common.PublicApi;
 
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEvent.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEvent.java
index 0d72101e..3a665646 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEvent.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java
index 1d4f6a45..b5cc0952 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataEventBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java
index 991b79f4..56b71acf 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataItemBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMap.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMap.java
index aad96e14..0cbb2c63 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMap.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,8 @@ import java.util.Set;
 public class DataMap {
     public static String TAG = "GmsDataMap";
 
-    private Map<String, Object> data = new HashMap<>();
-    private Map<String, StoredType> types = new HashMap<>();
+    private Map<String, Object> data = new HashMap<String, Object>();
+    private Map<String, StoredType> types = new HashMap<String, StoredType>();
 
     public DataMap() {
 
@@ -45,7 +45,7 @@ public class DataMap {
      * @return an ArrayList of DataMaps from an ArrayList of Bundles. Any elements in the Bundles not supported by DataMap will be dropped.
      */
     public static ArrayList<DataMap> arrayListFromBundleArrayList(ArrayList<Bundle> bundleArrayList) {
-        ArrayList<DataMap> res = new ArrayList<>();
+        ArrayList<DataMap> res = new ArrayList<DataMap>();
         for (Bundle bundle : bundleArrayList) {
             res.add(fromBundle(bundle));
         }
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMapItem.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMapItem.java
index 7eb6fb0f..3dadd29d 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMapItem.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataMapItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageApi.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageApi.java
index 999d615f..e2016f73 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageApi.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageEvent.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageEvent.java
index c5dd0d33..5c772334 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageEvent.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/NodeApi.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/NodeApi.java
index 86088446..4e9e19ae 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/NodeApi.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/NodeApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/PutDataMapRequest.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/PutDataMapRequest.java
index 339c23ef..6a171425 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/PutDataMapRequest.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/PutDataMapRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ package com.google.android.gms.wearable;
 
 import android.net.Uri;
 
+import com.google.android.gms.wearable.internal.PutDataRequest;
+
 import org.microg.gms.common.PublicApi;
 
 /**
@@ -38,7 +40,7 @@ public class PutDataMapRequest {
      */
     public PutDataRequest asPutDataRequest() {
         // TODO
-        return PutDataRequest.create(null);
+        return PutDataRequest.create((Uri) null);
     }
 
     /**
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java
index 72003234..420652a3 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ public class Wearable {
     /**
      * Token to pass to {@link GoogleApiClient.Builder#addApi(Api)} to enable the Wearable features.
      */
-    public static final Api<WearableOptions> API = new Api<>(new WearableApiBuilder());
+    public static final Api<WearableOptions> API = new Api<WearableOptions>(new WearableApiBuilder());
 
     public static final DataApi DataApi = new DataApiImpl();
     public static final MessageApi MessageApi = new MessageApiImpl();
diff --git a/play-services-wearable/src/main/java/com/google/android/gms/wearable/WearableListenerService.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/WearableListenerService.java
index 61a552d0..5817c5d3 100644
--- a/play-services-wearable/src/main/java/com/google/android/gms/wearable/WearableListenerService.java
+++ b/play-services-wearable/src/main/java/com/google/android/gms/wearable/WearableListenerService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/org/microg/gms/wearable/DataApiImpl.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/DataApiImpl.java
index bdfa778e..f7a09865 100644
--- a/play-services-wearable/src/main/java/org/microg/gms/wearable/DataApiImpl.java
+++ b/play-services-wearable/src/main/java/org/microg/gms/wearable/DataApiImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import com.google.android.gms.wearable.Asset;
 import com.google.android.gms.wearable.DataApi;
 import com.google.android.gms.wearable.DataItemAsset;
 import com.google.android.gms.wearable.DataItemBuffer;
-import com.google.android.gms.wearable.PutDataRequest;
+import com.google.android.gms.wearable.internal.PutDataRequest;
 
 public class DataApiImpl implements DataApi {
     @Override
diff --git a/play-services-wearable/src/main/java/org/microg/gms/wearable/MessageApiImpl.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/MessageApiImpl.java
index 667eaa77..3312ad45 100644
--- a/play-services-wearable/src/main/java/org/microg/gms/wearable/MessageApiImpl.java
+++ b/play-services-wearable/src/main/java/org/microg/gms/wearable/MessageApiImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/org/microg/gms/wearable/NodeApiImpl.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/NodeApiImpl.java
index 2aca31ee..4cf51a46 100644
--- a/play-services-wearable/src/main/java/org/microg/gms/wearable/NodeApiImpl.java
+++ b/play-services-wearable/src/main/java/org/microg/gms/wearable/NodeApiImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiBuilder.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiBuilder.java
index c19f5da4..1d103230 100644
--- a/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiBuilder.java
+++ b/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 µg Project Team
+ * Copyright 2013-2015 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.