| commit | b74ebcabe05d8ba91ff4a3bda4cc3fc6790ac39d | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Nov 12 23:13:17 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 12 23:13:17 2009 -0800 |
| tree | 83e4994b4bf44c3f583faef99b7918db860e6a2a | |
| parent | 5b65ef4c95e289ac3e8dca8c9ebfd8b71a7f0e4e [diff] | |
| parent | 126fee88d480939d46b8ddd1e3a03cdd193fa040 [diff] |
am 126fee88: am db9f06d9: resolved conflicts for merge of 2a1e9641 to eclair-mr2 Merge commit '126fee88d480939d46b8ddd1e3a03cdd193fa040' * commit '126fee88d480939d46b8ddd1e3a03cdd193fa040': Add code to use Gservices provided values for throtting NITZ updates.