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

Conflicts:
	default.xml

default.xml

@@ -19,7 +19,7 @@
            review="gerrit.twrp.me"
            fetch="https://github.com/TeamWin" />
 
-  <default revision="refs/tags/android-6.0.1_r30"
+  <default revision="refs/tags/android-6.0.1_r43"
            remote="aosp"
            sync-c="true"
            sync-j="4" />
@@ -290,7 +290,7 @@
   <!-- project path="frameworks/opt/inputconnectioncommon" name="platform/frameworks/opt/inputconnectioncommon" groups="pdk-fs" /> -->
   <!-- project path="frameworks/opt/inputmethodcommon" name="platform/frameworks/opt/inputmethodcommon" groups="pdk-cw-fs" /> -->
   <!-- project path="frameworks/opt/net/ethernet" name="platform/frameworks/opt/net/ethernet" groups="pdk-fs" /> -->
-  <!-- project path="frameworks/opt/net/ims" name="platform/frameworks/opt/net/ims" groups="frameworks_ims,pdk-cw-fs" /> -->
+  <!-- project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-6.0" /> -->
   <!-- project path="frameworks/opt/net/voip" name="android_frameworks_opt_net_voip" remote="omnirom" revision="android-6.0" /> -->
   <!-- project path="frameworks/opt/net/wifi" name="android_frameworks_opt_net_wifi" remote="omnirom" revision="android-6.0" /> -->
   <!-- project path="frameworks/opt/photoviewer" name="platform/frameworks/opt/photoviewer" groups="pdk-cw-fs" /> -->