XPrivacy 2.2.1

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
PA GAPPS 23 July

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/updater-script
	_archidroid/gapps/system/priv-app/PrebuiltGmsCore.apk

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
	META-INF/com/google/android/updater-script
	_archidroid/gapps/archidroid/system/priv-app/PrebuiltGmsCore.apk
	_archidroid/gapps/core/system/app/ChromeBookmarksSyncAdapter.apk
	_archidroid/gapps/core/system/app/FaceLock.apk
	_archidroid/gapps/core/system/app/GenieWidget.apk
	_archidroid/gapps/core/system/app/Gmail2.apk
	_archidroid/gapps/core/system/app/GoogleContactsSyncAdapter.apk
	_archidroid/gapps/core/system/app/GoogleTTS.apk
	_archidroid/gapps/core/system/etc/permissions/com.google.android.ble.xml
	_archidroid/gapps/core/system/etc/permissions/com.google.android.camera2.xml
	_archidroid/gapps/core/system/etc/permissions/com.google.android.maps.xml
	_archidroid/gapps/core/system/etc/permissions/com.google.android.media.effects.xml
	_archidroid/gapps/core/system/etc/permissions/com.google.widevine.software.drm.xml
	_archidroid/gapps/core/system/etc/permissions/features.xml
	_archidroid/gapps/core/system/etc/preferred-apps/google.xml
	_archidroid/gapps/core/system/framework/com.google.android.ble.jar
	_archidroid/gapps/core/system/framework/com.google.android.camera2.jar
	_archidroid/gapps/core/system/framework/com.google.android.maps.jar
	_archidroid/gapps/core/system/framework/com.google.android.media.effects.jar
	_archidroid/gapps/core/system/framework/com.google.widevine.software.drm.jar
	_archidroid/gapps/core/system/lib/libfacelock_jni.so
	_archidroid/gapps/core/system/lib/libfilterpack_facedetect.so
	_archidroid/gapps/core/system/lib/libgoogle_hotword_jni.so
	_archidroid/gapps/core/system/lib/libgoogle_recognizer_jni_l.so
	_archidroid/gapps/core/system/lib/libjgcastservice.so
	_archidroid/gapps/core/system/lib/libjni_latinime.so
	_archidroid/gapps/core/system/lib/libpatts_engine_jni_api_ub.210030103.so
	_archidroid/gapps/core/system/lib/libspeexwrapper.so
	_archidroid/gapps/core/system/lib/libvcdecoder_jni.so
	_archidroid/gapps/core/system/priv-app/CalendarProvider.apk
	_archidroid/gapps/core/system/priv-app/GoogleBackupTransport.apk
	_archidroid/gapps/core/system/priv-app/GoogleFeedback.apk
	_archidroid/gapps/core/system/priv-app/GoogleLoginService.apk
	_archidroid/gapps/core/system/priv-app/GoogleOneTimeInitializer.apk
	_archidroid/gapps/core/system/priv-app/GooglePartnerSetup.apk
	_archidroid/gapps/core/system/priv-app/GoogleServicesFramework.apk
	_archidroid/gapps/core/system/priv-app/SetupWizard.apk
	_archidroid/gapps/core/system/priv-app/Velvet.apk
	_archidroid/gapps/core/system/usr/srec/en-US/c_fst
	_archidroid/gapps/core/system/usr/srec/en-US/clg
	_archidroid/gapps/core/system/usr/srec/en-US/commands.abnf
	_archidroid/gapps/core/system/usr/srec/en-US/compile_grammar.config
	_archidroid/gapps/core/system/usr/srec/en-US/contacts.abnf
	_archidroid/gapps/core/system/usr/srec/en-US/dict
	_archidroid/gapps/core/system/usr/srec/en-US/dictation.config
	_archidroid/gapps/core/system/usr/srec/en-US/dnn
	_archidroid/gapps/core/system/usr/srec/en-US/endpointer_dictation.config
	_archidroid/gapps/core/system/usr/srec/en-US/endpointer_voicesearch.config
	_archidroid/gapps/core/system/usr/srec/en-US/ep_acoustic_model
	_archidroid/gapps/core/system/usr/srec/en-US/g2p_fst
	_archidroid/gapps/core/system/usr/srec/en-US/grammar.config
	_archidroid/gapps/core/system/usr/srec/en-US/hclg_shotword
	_archidroid/gapps/core/system/usr/srec/en-US/hmm_symbols
	_archidroid/gapps/core/system/usr/srec/en-US/hmmlist
	_archidroid/gapps/core/system/usr/srec/en-US/hotword.config
	_archidroid/gapps/core/system/usr/srec/en-US/hotword_classifier
	_archidroid/gapps/core/system/usr/srec/en-US/hotword_normalizer
	_archidroid/gapps/core/system/usr/srec/en-US/hotword_prompt.txt
	_archidroid/gapps/core/system/usr/srec/en-US/hotword_word_symbols
	_archidroid/gapps/core/system/usr/srec/en-US/metadata
	_archidroid/gapps/core/system/usr/srec/en-US/norm_fst
	_archidroid/gapps/core/system/usr/srec/en-US/normalizer
	_archidroid/gapps/core/system/usr/srec/en-US/offensive_word_normalizer
	_archidroid/gapps/core/system/usr/srec/en-US/phone_state_map
	_archidroid/gapps/core/system/usr/srec/en-US/phonelist
	_archidroid/gapps/core/system/usr/srec/en-US/rescoring_lm
	_archidroid/gapps/core/system/usr/srec/en-US/wordlist
	_archidroid/gapps/core/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	_archidroid/gapps/core/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	_archidroid/gapps/core/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-2.bin
	_archidroid/gapps/core/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-r0-ri30.4a-v24.bin
	_archidroid/gapps/core/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rn30-ri30.5-v24.bin
	_archidroid/gapps/core/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rp30-ri30.5-v24.bin
	_archidroid/gapps/core/system/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N.bin
	_archidroid/gapps/system/app/CalendarGoogle.apk
	_archidroid/gapps/system/app/ChromeBookmarksSyncAdapter.apk
	_archidroid/gapps/system/app/FaceLock.apk
	_archidroid/gapps/system/app/GenieWidget.apk
	_archidroid/gapps/system/app/Gmail2.apk
	_archidroid/gapps/system/app/GoogleContactsSyncAdapter.apk
	_archidroid/gapps/system/app/GoogleTTS.apk
	_archidroid/gapps/system/etc/g.prop
	_archidroid/gapps/system/etc/permissions/com.google.android.ble.xml
	_archidroid/gapps/system/etc/permissions/com.google.android.camera2.xml
	_archidroid/gapps/system/etc/permissions/com.google.android.maps.xml
	_archidroid/gapps/system/etc/permissions/com.google.android.media.effects.xml
	_archidroid/gapps/system/etc/permissions/com.google.widevine.software.drm.xml
	_archidroid/gapps/system/etc/permissions/features.xml
	_archidroid/gapps/system/etc/preferred-apps/google.xml
	_archidroid/gapps/system/framework/com.google.android.ble.jar
	_archidroid/gapps/system/framework/com.google.android.camera2.jar
	_archidroid/gapps/system/framework/com.google.android.maps.jar
	_archidroid/gapps/system/framework/com.google.android.media.effects.jar
	_archidroid/gapps/system/framework/com.google.widevine.software.drm.jar
	_archidroid/gapps/system/lib/libfacelock_jni.so
	_archidroid/gapps/system/lib/libfilterpack_facedetect.so
	_archidroid/gapps/system/lib/libgoogle_hotword_jni.so
	_archidroid/gapps/system/lib/libgoogle_recognizer_jni_l.so
	_archidroid/gapps/system/lib/libjgcastservice.so
	_archidroid/gapps/system/lib/libjni_latinime.so
	_archidroid/gapps/system/lib/libpatts_engine_jni_api_ub.210030103.so
	_archidroid/gapps/system/lib/libspeexwrapper.so
	_archidroid/gapps/system/lib/libvcdecoder_jni.so
	_archidroid/gapps/system/priv-app/CalendarProvider.apk
	_archidroid/gapps/system/priv-app/GoogleBackupTransport.apk
	_archidroid/gapps/system/priv-app/GoogleFeedback.apk
	_archidroid/gapps/system/priv-app/GoogleLoginService.apk
	_archidroid/gapps/system/priv-app/GoogleOneTimeInitializer.apk
	_archidroid/gapps/system/priv-app/GooglePartnerSetup.apk
	_archidroid/gapps/system/priv-app/GoogleServicesFramework.apk
	_archidroid/gapps/system/priv-app/Phonesky.apk
	_archidroid/gapps/system/priv-app/PrebuiltGmsCore.apk
	_archidroid/gapps/system/priv-app/SetupWizard.apk
	_archidroid/gapps/system/priv-app/Velvet.apk
	_archidroid/gapps/system/usr/srec/en-US/c_fst
	_archidroid/gapps/system/usr/srec/en-US/clg
	_archidroid/gapps/system/usr/srec/en-US/commands.abnf
	_archidroid/gapps/system/usr/srec/en-US/compile_grammar.config
	_archidroid/gapps/system/usr/srec/en-US/contacts.abnf
	_archidroid/gapps/system/usr/srec/en-US/dict
	_archidroid/gapps/system/usr/srec/en-US/dictation.config
	_archidroid/gapps/system/usr/srec/en-US/dnn
	_archidroid/gapps/system/usr/srec/en-US/endpointer_dictation.config
	_archidroid/gapps/system/usr/srec/en-US/endpointer_voicesearch.config
	_archidroid/gapps/system/usr/srec/en-US/ep_acoustic_model
	_archidroid/gapps/system/usr/srec/en-US/g2p_fst
	_archidroid/gapps/system/usr/srec/en-US/grammar.config
	_archidroid/gapps/system/usr/srec/en-US/hclg_shotword
	_archidroid/gapps/system/usr/srec/en-US/hmm_symbols
	_archidroid/gapps/system/usr/srec/en-US/hmmlist
	_archidroid/gapps/system/usr/srec/en-US/hotword.config
	_archidroid/gapps/system/usr/srec/en-US/hotword_classifier
	_archidroid/gapps/system/usr/srec/en-US/hotword_normalizer
	_archidroid/gapps/system/usr/srec/en-US/hotword_prompt.txt
	_archidroid/gapps/system/usr/srec/en-US/hotword_word_symbols
	_archidroid/gapps/system/usr/srec/en-US/metadata
	_archidroid/gapps/system/usr/srec/en-US/norm_fst
	_archidroid/gapps/system/usr/srec/en-US/normalizer
	_archidroid/gapps/system/usr/srec/en-US/offensive_word_normalizer
	_archidroid/gapps/system/usr/srec/en-US/phone_state_map
	_archidroid/gapps/system/usr/srec/en-US/phonelist
	_archidroid/gapps/system/usr/srec/en-US/rescoring_lm
	_archidroid/gapps/system/usr/srec/en-US/wordlist
	_archidroid/gapps/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	_archidroid/gapps/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	_archidroid/gapps/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-2.bin
	_archidroid/gapps/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-r0-ri30.4a-v24.bin
	_archidroid/gapps/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rn30-ri30.5-v24.bin
	_archidroid/gapps/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rp30-ri30.5-v24.bin
	_archidroid/gapps/system/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N.bin
	_mrturdroid/apps/google/gtts/system/app/GoogleTTS.apk
	_mrturdroid/apps/google/gtts/system/lib/libpatts_engine_jni_api_ub.210030103.so
	_mrturdroid/apps/google/gtts/system/lib/libspeexwrapper.so
	_mrturdroid/apps/google/mail/system/app/Gmail2.apk
	_mrturdroid/apps/google/plus/system/app/com.google.android.apps.plus-1.apk
	_mrturdroid/gapps/system/app/ChromeBookmarksSyncAdapter.apk
	_mrturdroid/gapps/system/app/FaceLock.apk
	_mrturdroid/gapps/system/app/GenieWidget.apk
	_mrturdroid/gapps/system/app/GoogleContactsSyncAdapter.apk
	_mrturdroid/gapps/system/etc/permissions/com.google.android.ble.xml
	_mrturdroid/gapps/system/etc/permissions/com.google.android.camera2.xml
	_mrturdroid/gapps/system/etc/permissions/com.google.android.maps.xml
	_mrturdroid/gapps/system/etc/permissions/com.google.android.media.effects.xml
	_mrturdroid/gapps/system/etc/permissions/com.google.widevine.software.drm.xml
	_mrturdroid/gapps/system/etc/permissions/features.xml
	_mrturdroid/gapps/system/etc/preferred-apps/google.xml
	_mrturdroid/gapps/system/framework/com.google.android.ble.jar
	_mrturdroid/gapps/system/framework/com.google.android.camera2.jar
	_mrturdroid/gapps/system/framework/com.google.android.maps.jar
	_mrturdroid/gapps/system/framework/com.google.android.media.effects.jar
	_mrturdroid/gapps/system/framework/com.google.widevine.software.drm.jar
	_mrturdroid/gapps/system/lib/libAppDataSearch.so
	_mrturdroid/gapps/system/lib/libfacelock_jni.so
	_mrturdroid/gapps/system/lib/libfilterpack_facedetect.so
	_mrturdroid/gapps/system/lib/libgames_rtmp_jni.so
	_mrturdroid/gapps/system/lib/libgcastv2_base.so
	_mrturdroid/gapps/system/lib/libgcastv2_support.so
	_mrturdroid/gapps/system/lib/libgoogle_hotword_jni.so
	_mrturdroid/gapps/system/lib/libgoogle_recognizer_jni_l.so
	_mrturdroid/gapps/system/lib/libjgcastservice.so
	_mrturdroid/gapps/system/lib/libjni_latinime.so
	_mrturdroid/gapps/system/lib/libvcdecoder_jni.so
	_mrturdroid/gapps/system/priv-app/CalendarProvider.apk
	_mrturdroid/gapps/system/priv-app/GoogleBackupTransport.apk
	_mrturdroid/gapps/system/priv-app/GoogleFeedback.apk
	_mrturdroid/gapps/system/priv-app/GoogleLoginService.apk
	_mrturdroid/gapps/system/priv-app/GoogleOneTimeInitializer.apk
	_mrturdroid/gapps/system/priv-app/GooglePartnerSetup.apk
	_mrturdroid/gapps/system/priv-app/GoogleServicesFramework.apk
	_mrturdroid/gapps/system/priv-app/PrebuiltGmsCore.apk
	_mrturdroid/gapps/system/priv-app/SetupWizard.apk
	_mrturdroid/gapps/system/usr/srec/en-US/c_fst
	_mrturdroid/gapps/system/usr/srec/en-US/clg
	_mrturdroid/gapps/system/usr/srec/en-US/commands.abnf
	_mrturdroid/gapps/system/usr/srec/en-US/compile_grammar.config
	_mrturdroid/gapps/system/usr/srec/en-US/contacts.abnf
	_mrturdroid/gapps/system/usr/srec/en-US/dict
	_mrturdroid/gapps/system/usr/srec/en-US/dictation.config
	_mrturdroid/gapps/system/usr/srec/en-US/dnn
	_mrturdroid/gapps/system/usr/srec/en-US/endpointer_dictation.config
	_mrturdroid/gapps/system/usr/srec/en-US/endpointer_voicesearch.config
	_mrturdroid/gapps/system/usr/srec/en-US/ep_acoustic_model
	_mrturdroid/gapps/system/usr/srec/en-US/g2p_fst
	_mrturdroid/gapps/system/usr/srec/en-US/grammar.config
	_mrturdroid/gapps/system/usr/srec/en-US/hclg_shotword
	_mrturdroid/gapps/system/usr/srec/en-US/hmm_symbols
	_mrturdroid/gapps/system/usr/srec/en-US/hmmlist
	_mrturdroid/gapps/system/usr/srec/en-US/hotword.config
	_mrturdroid/gapps/system/usr/srec/en-US/hotword_classifier
	_mrturdroid/gapps/system/usr/srec/en-US/hotword_normalizer
	_mrturdroid/gapps/system/usr/srec/en-US/hotword_prompt.txt
	_mrturdroid/gapps/system/usr/srec/en-US/hotword_word_symbols
	_mrturdroid/gapps/system/usr/srec/en-US/metadata
	_mrturdroid/gapps/system/usr/srec/en-US/norm_fst
	_mrturdroid/gapps/system/usr/srec/en-US/normalizer
	_mrturdroid/gapps/system/usr/srec/en-US/offensive_word_normalizer
	_mrturdroid/gapps/system/usr/srec/en-US/phone_state_map
	_mrturdroid/gapps/system/usr/srec/en-US/phonelist
	_mrturdroid/gapps/system/usr/srec/en-US/rescoring_lm
	_mrturdroid/gapps/system/usr/srec/en-US/wordlist
	_mrturdroid/gapps/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/left_eye-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	_mrturdroid/gapps/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/nose_base-y0-yi45-p0-pi45-r0-ri20.lg_32.bin
	_mrturdroid/gapps/system/vendor/pittpatt/models/detection/multi_pose_face_landmark_detectors.7/right_eye-y0-yi45-p0-pi45-r0-ri20.lg_32-2.bin
	_mrturdroid/gapps/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-r0-ri30.4a-v24.bin
	_mrturdroid/gapps/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rn30-ri30.5-v24.bin
	_mrturdroid/gapps/system/vendor/pittpatt/models/detection/yaw_roll_face_detectors.6/head-y0-yi45-p0-pi45-rp30-ri30.5-v24.bin
	_mrturdroid/gapps/system/vendor/pittpatt/models/recognition/face.face.y0-y0-22-b-N.bin
PA GAPPS 25 July

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt

Conflicts:
	META-INF/com/google/android/aroma/_changelog.txt
Slim-mako-4.4.4.build.6.8-WEEKLY-5801
Adaptation to MrturDroid
Google Maps 8.2.0