| commit | bc75548c329d08a44c5baa026fdee63bdbfea89b | [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 | b12fcd784e3c684ac45f486ae827160716c91366 | |
| parent | 693ee83a6ce3e02e7844e1785bd86854a53042c8 [diff] | |
| parent | c1abed5b5b202d7dec168959b9b8cb3f78ccbad3 [diff] |
am c1abed5b: Merge "Tell the resolver what protocols to use." into ics-factoryrom * commit 'c1abed5b5b202d7dec168959b9b8cb3f78ccbad3': Tell the resolver what protocols to use.