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

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

Change-Id: I298e588b1076686e2c7c4b3714b46d2637b04079
tree: 6c4f311d515d62a63a4bc090fc55f76f614b7d14
  1. src/
  2. tests/
  3. tools/
  4. Android.mk
  5. CleanSpec.mk