backuptool: Add support for cross-version whitelists

Change-Id: I415eb4d64d693a7e150656802be7f7c4a0e5ab8b
Update cm_i9100.conf
Update cm_i9100.conf
Revert "Update cm_i9100.conf"

This reverts commit d243325c1fe7f8b702a182e694b8dad49e126407.
Revert "Update cm_i9100.conf"

This reverts commit 1f68e0f6a0a3a16aedb1ff6793bd63d4da507e4d.
Revert "Hybrid preparation (8/x)"

This reverts commit 0d07dbef4bc004f3636706769bee7bc53714b46b.
Revert "Hybrid preparation (2/x)"

This reverts commit 975a041f750439a4397a38a7ade12b1ee8ef8e1b.
Revert "Hybrid preparation (1/x)"

This reverts commit b31fe70c93f507d839e882f12cdd971ce4892ef3.
Prevent stock OTA activities from running in CM

Change-Id: I3f586cd246fc351afb82c94f41329bf930f6f41a
Merge pull request #8 from CyanogenMod/cm-10.2

backuptool: Add support for cross-version whitelists
Merge pull request #9 from CyanogenMod/cm-10.2

Prevent stock OTA activities from running in CM
otablock: Disable only the actual activity, leave the service on

This is apparently shutting down uncleanly and frequently leaving
unwanted stuff active :(

Change-Id: I08e7b28adf1ec0725b82357df96beda2527e2f16
otablock: also disable BroadcastReceiver

otherwise it'll prevent the device from going to sleep

Change-Id: I56e20c4b3e33c78f30e095f38240d6663c9d74f5
Revert "otablock: Disable only the actual activity, leave the service on"

This reverts commit 583a6429e6894a5e6dc0a73c48d4513322fe49a4, pawit
got a better fix
Merge "otablock: also disable BroadcastReceiver" into cm-10.2
Merge pull request #10 from CyanogenMod/cm-10.2

Cm 10.2
Version 0.93
Merge branch 'cm-10.2' of https://github.com/CyanFox/android_vendor_cm into cm-10.2