| commit | 53f286599b669964783819d95cd4c0fc9d01864b | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Nov 12 23:08:56 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 12 23:08:56 2009 -0800 |
| tree | 648049c94f6e9ecabe1c8ca6c9ec212ef62572b9 | |
| parent | 6116d330e1802338f64e720333a1e54695e1d30a [diff] | |
| parent | cee3c3ce811312681941a6d51931acbeff627b06 [diff] |
am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2 Merge commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef' into eclair-mr2-plus-aosp * commit 'db9f06d9c44cd640f282b1a631ae82d3652beeef': Add code to use Gservices provided values for throtting NITZ updates.