Merge branch 'android-5.1' of https://github.com/omnirom/android into omnirom-android-5.1

Conflicts:
	default.xml

default.xml

@@ -432,7 +432,7 @@
   <!--project path="packages/screensavers/PhotoTable" name="platform/packages/screensavers/PhotoTable" /> -->
   <!--project path="packages/screensavers/WebView" name="platform/packages/screensavers/WebView" /> -->
   <!--project path="packages/services/Mms" name="platform/packages/services/Mms" /> -->
-  <!--project path="packages/services/Telecomm" name="platform/packages/services/Telecomm" /> -->
+  <!--project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-5.1" /> -->
   <!--project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-5.1" /> -->
   <!--project path="packages/wallpapers/Basic" name="android_packages_wallpapers_Basic" remote="omnirom" revision="android-5.1" /> -->
   <!--project path="packages/wallpapers/Galaxy4" name="platform/packages/wallpapers/Galaxy4" /> -->