am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread

* commit '6987036fabbd2c0351986efcfd11e714ae75fdf8':
  Make setupDataCall take a protocol parameter.