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

Conflicts:
	default.xml

default.xml

@@ -366,7 +366,7 @@
   <!-- project path="packages/apps/Email" name="android_packages_apps_Email" remote="omnirom" revision="android-6.0" /> -->
   <!-- project path="packages/apps/ExactCalculator" name="platform/packages/apps/ExactCalculator" groups="pdk-fs" /> -->
   <!-- project path="packages/apps/Exchange" name="platform/packages/apps/Exchange" remote="omnirom" revision="android-6.0" /> -->
-  <!-- project path="packages/apps/FMRadio" name="platform/packages/apps/FMRadio" /> -->
+  <!-- project path="packages/apps/FMRadio" name="android_packages_apps_FMRadio" remote="omnirom" revision="android-6.0" /> -->
   <!-- project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-6.0" /> -->
   <!-- project path="packages/apps/HTMLViewer" name="platform/packages/apps/HTMLViewer" /> -->
   <!-- project path="packages/apps/InCallUI" name="android_packages_apps_InCallUI" remote="omnirom" revision="android-6.0" /> -->