tree a95e04107ee69d5add34d89a3c8814ede4970e36
parent 3a9bdac17222298b180cec1e1d43a28c3d8ccda9
parent 3cf6b65abd505d0bcc77607001250767259094fa
author Lorenzo Colitti <lorenzo@google.com> 1299346003 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299346003 -0800

am 23a63260: am ba76f2ac: (-s ours) am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread

* commit '23a632609c1b6221cf06f36922e9ab95065aa938':
  Make setupDataCall take a protocol parameter.