Merge "Fix overridden packages in backuptool" into ics
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 00c76a6..3b13843 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -79,13 +79,13 @@
app/SetupWizard.apk app/Provision.apk
app/GoogleEarth.apk
app/ChromeBookmarksSyncAdapter.apk
-app/GoogleQuickSearchBox.apk
+app/GoogleQuickSearchBox.apk app/QuickSearchBox.apk
app/GoogleLoginService.apk
app/Talk.apk
app/Maps.apk
app/GooglePackageVerifier.apk
app/GoogleBackupTransport.apk
-app/GalleryGoogle.apk app/Gallery.apk
+app/GalleryGoogle.apk app/Gallery2.apk
app/FaceLock.apk
app/Vending.apk
app/GoogleContactsSyncAdapter.apk