tree 2fb36192abf7962220586297fc88c8f861822f65
parent fe47014ce751d044681702bf85c4ce4cecf56a10
parent 951e9a05ee8af86a7e0a5a5157a8baedbc8d4edf
author Lorenzo Colitti <lorenzo@google.com> 1304363527 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304363527 -0700

am 951e9a05: Merge from gingerbread

* commit '951e9a05ee8af86a7e0a5a5157a8baedbc8d4edf':
  Add the protocol column to the carriers table.