tree c5158219b736e234349553a67ca5401871891f3f
parent 006dc043f0df929140ed71a28f4c401fa2e3bcd3
parent b849074cb58edc15b0764afdde0326c0b6d5b147
author Robert Greenwalt <rgreenwalt@google.com> 1316759993 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316759993 -0700

am b849074c: Merge "Tell the resolver what protocols to use." into ics-factoryrom

* commit 'b849074cb58edc15b0764afdde0326c0b6d5b147':
  Tell the resolver what protocols to use.