| commit | 3136c613e177ea17c18c977ac96bda9c11143dfb | [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 | 42af2688641e0990973d8ea27a2c3f23273a9c53 [diff] | |
| parent | 1c1c06faebfb98e2f65c5ae895355057136e977e [diff] |
am b39f3f46: am 1c1c06fa: 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