am 2ebb3a2d: (-s ours) am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread

* commit '2ebb3a2d9b31213ced141c1807f60e13983f40dd':
  Fix GSM permanent failure handling, DO NOT MERGE.