am b39f3f46: am 8b3750e2: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI...
am b39f3f46: am 8b3750e2: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
* commit 'b39f3f46':
Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global