Merge "omni: update 32 and 64 bit chromium to 52.0.2743.83" into android-6.0
diff --git a/utils/omni-list b/utils/aosp-forked-list
similarity index 98%
rename from utils/omni-list
rename to utils/aosp-forked-list
index 1e7025d..d2c56ba 100644
--- a/utils/omni-list
+++ b/utils/aosp-forked-list
@@ -62,6 +62,7 @@
packages/apps/Gallery2
packages/apps/InCallUI
packages/apps/Launcher3
+packages/apps/Messaging
packages/apps/Nfc
packages/apps/PackageInstaller
packages/apps/QuickSearchBox
diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index dfd197d..63af702 100755
--- a/utils/aosp-merge.sh
+++ b/utils/aosp-merge.sh
@@ -54,4 +54,4 @@
cd - > /dev/null
-done < vendor/omni/utils/omni-list
+done < vendor/omni/utils/aosp-forked-list
diff --git a/utils/omni-push.sh b/utils/aosp-push-merge.sh
similarity index 96%
rename from utils/omni-push.sh
rename to utils/aosp-push-merge.sh
index fc856d2..eb375cb 100755
--- a/utils/omni-push.sh
+++ b/utils/aosp-push-merge.sh
@@ -42,4 +42,4 @@
cd - > /dev/null
-done < vendor/omni/utils/omni-list
+done < vendor/omni/utils/aosp-forked-list