am 0990484c: am 3d4069a2: Allow TTY mode for GSM Phones

* commit '0990484c3ef96c6f0553374675b76fed54b5b164':
  Allow TTY mode for GSM Phones

diff --cc telephony/java/com/android/internal/telephony/CommandsInterface.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/Phone.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/PhoneBase.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java
Simple merge

diff --cc telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
Simple merge