aosp-push-merge:update destination branch to android-7.0
Change-Id: I8219ccf2ae549dbd6ee626a91f0a1a26c7e90afc
diff --git a/utils/aosp-forked-list b/utils/aosp-forked-list
index 203e63a..9bd14ff 100644
--- a/utils/aosp-forked-list
+++ b/utils/aosp-forked-list
@@ -5,19 +5,16 @@
development
device/generic/mini-emulator-armv7-a-neon
external/clang
-external/dhcpcd
external/e2fsprogs
external/f2fs-tools
external/flac
external/jhead
-external/jpeg
external/libexif
external/libnfc-nci
external/libpng
external/libxml2
external/llvm
external/lz4
-external/sepolicy
external/skia
external/tinyalsa
external/tinycompress
@@ -52,19 +49,15 @@
hardware/ril
libcore
packages/apps/Bluetooth
-packages/apps/Browser
packages/apps/Camera2
packages/apps/Contacts
packages/apps/ContactsCommon
packages/apps/Dialer
packages/apps/Email
packages/apps/FMRadio
-packages/apps/InCallUI
-packages/apps/Launcher3
packages/apps/Messaging
packages/apps/Nfc
packages/apps/PackageInstaller
-packages/apps/QuickSearchBox
packages/apps/Settings
packages/apps/UnifiedEmail
packages/inputmethods/LatinIME
diff --git a/utils/aosp-push-merge.sh b/utils/aosp-push-merge.sh
index eb375cb..ee39ee3 100755
--- a/utils/aosp-push-merge.sh
+++ b/utils/aosp-push-merge.sh
@@ -19,7 +19,7 @@
url="gerrit.omnirom.org"
port="29418"
-branch="android-6.0"
+branch="android-7.0"
cd ../../../