| commit | 5389aec62e679f28aec32e1c12de90c030d252c5 | [log] [tgz] |
|---|---|---|
| author | Ashish Sharma <ashishsharma@google.com> | Wed Sep 26 13:53:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 26 13:53:01 2012 -0700 |
| tree | 817aeddfbb613e791217aff06fccd9b3dae075b6 | |
| parent | 0482f99ae4801f4b92936e9f84d82bd64db70aa5 [diff] | |
| parent | f605dcb8ad915f2aaaa08f68297edaffd1ed3034 [diff] |
am b39f3f46: am f605dcb8: Merge "Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global" into jb-mr1-dev * commit 'b39f3f4696bf473d986ecc45461754beec931174': Migrate DATA_ACTIVITY_TIMEOUT_MOBILE/WIFI from Settings.Secure to Settings.Global