| commit | 126fee88d480939d46b8ddd1e3a03cdd193fa040 | [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 | 01dd668798e47f6c0e545105224db04095ef62b2 | |
| parent | 2a77d4633aae1d04054fb09850d7939aa386b0a0 [diff] | |
| parent | db9f06d9c44cd640f282b1a631ae82d3652beeef [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.