tree 6c4f311d515d62a63a4bc090fc55f76f614b7d14
parent 6c5e8c9ef98f3ef8f87e4a5c06f730cf7d0c1536
parent 958e731633ccc639f78b9842abd833794173ce6d
author Wink Saville <wink@google.com> 1363024971 -0700
committer Wink Saville <wink@google.com> 1363024971 -0700

Merge commit '958e7316' into fix-merge-conflict

* commit '958e7316':
  Telephony: Set TP-RD to 1 in case of retry

Change-Id: I298e588b1076686e2c7c4b3714b46d2637b04079