Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f605dcb8ad