Merge commit 'eb7d144424aae66b25737a8d8791d192c980d86b' into HEAD
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:19 +0000 (12:38 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Dec 2013 20:38:19 +0000 (12:38 -0800)
commit7330d304407448eceababbe4772253b135674f27
tree2d237a425fbca2ef9f9a921953a279526829024c
parent9e6a8351f1ee21e7dd7d30583c7085fcbeb3a863
parenteb7d144424aae66b25737a8d8791d192c980d86b
Merge commit 'eb7d144424aae66b25737a8d8791d192c980d86b' into HEAD
src/java/com/android/internal/telephony/CommandsInterface.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/cdma/SmsMessage.java
src/java/com/android/internal/telephony/sip/SipCommandInterface.java
src/java/com/android/internal/telephony/test/SimulatedCommands.java
tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java