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