| commit | 511ecc8cf9f1b0660c4284f667cbc3807d2ebf82 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Sep 22 23:39:53 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 22 23:39:53 2011 -0700 |
| tree | c5158219b736e234349553a67ca5401871891f3f | |
| parent | 006dc043f0df929140ed71a28f4c401fa2e3bcd3 [diff] | |
| parent | b849074cb58edc15b0764afdde0326c0b6d5b147 [diff] |
am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom * commit 'b849074cb58edc15b0764afdde0326c0b6d5b147': Tell the resolver what protocols to use.