merged_repos

build/kati
dalvik
external/android-clat
external/aac
external/apache-http
bootable/recovery
development
bionic
external/bzip2
build									conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
external/e2fsprogs
external/boringssl
art
external/elfutils
external/f2fs-tools
external/flac
external/gptfdisk
external/jemalloc
external/ipsec-tools
external/iproute2
external/iptables
external/libhevc
external/icu
external/libnfc-nxp
external/libselinux
external/libnfc-nci
external/libvterm
external/lz4
external/lzma
external/libxml2
external/mksh
external/okhttp
external/tinyxml2
external/tinyalsa
external/skia
external/toybox
external/tinycompress
external/zlib
frameworks/opt/datetimepicker
frameworks/opt/chips
frameworks/opt/net/ims							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
frameworks/native							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
frameworks/opt/net/wifi							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
frameworks/opt/setupwizard
frameworks/av								conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
frameworks/opt/vcard
frameworks/opt/telephony						conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
hardware/broadcom/libbt
hardware/broadcom/wlan
hardware/intel/common/libmix
hardware/intel/common/libva
frameworks/support
hardware/intel/common/libwsbm
hardware/intel/common/omx-components
hardware/intel/common/utils
hardware/intel/img/hwcomposer
hardware/invensense
hardware/qcom/bootctrl
hardware/qcom/bt
hardware/libhardware
hardware/qcom/audio/default						conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
hardware/qcom/camera
hardware/qcom/gps
hardware/qcom/keymaster
hardware/qcom/display							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
hardware/qcom/wlan
hardware/ril
hardware/qcom/media							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
hardware/ti/omap4xxx
packages/apps/Bluetooth							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
libcore									conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/apps/Calendar
packages/apps/CarrierConfig						conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/apps/Camera2
packages/apps/CellBroadcastReceiver					conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/apps/CertInstaller
packages/apps/ContactsCommon
packages/apps/Email
packages/apps/EmergencyInfo
packages/apps/Contacts
packages/apps/DeskClock
packages/apps/Dialer							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
frameworks/base								conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/apps/ExactCalculator
packages/apps/HTMLViewer
packages/apps/KeyChain
packages/apps/Gallery2
packages/apps/ManagedProvisioning
packages/apps/Launcher3							forcepush (on invisiblek's cm-14.1_android-7.1.1_r4 branch)
packages/apps/Messaging
packages/apps/Nfc
packages/apps/PhoneCommon
packages/apps/PackageInstaller
packages/apps/SafetyRegulatoryInfo
packages/apps/SoundRecorder
packages/apps/StorageManager
packages/apps/Stk							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/apps/Tag
packages/apps/TV
packages/apps/Terminal
packages/apps/TvSettings
packages/apps/UnifiedEmail
packages/apps/WallpaperPicker						forcepush (on invisiblek's cm-14.1_android-7.1.1_r4 branch)
packages/providers/BlockedNumberProvider
packages/providers/BookmarkProvider
packages/providers/CallLogProvider
packages/providers/CalendarProvider
packages/apps/Settings							conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/providers/ContactsProvider
packages/inputmethods/LatinIME
packages/providers/PartnerBookmarksProvider
packages/providers/TelephonyProvider
packages/providers/MediaProvider
packages/providers/DownloadProvider					conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/providers/TvProvider
packages/providers/UserDictionaryProvider
packages/screensavers/Basic
packages/screensavers/PhotoTable
packages/screensavers/WebView
packages/services/Car
packages/services/Mms
packages/services/Telecomm						conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/services/Telephony						conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
packages/wallpapers/LivePicker
system/bt								conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
system/extras
system/netd
system/media
system/core								conflicts (on invisiblek's cm-14.1_android-7.1.1_r4 branch) 
system/security
system/sepolicy
system/tools/aidl
system/keymaster
system/vold