Merge commit '616b281b' into merge-conflict-TelephonySignal-Strength-cleanup
authorWink Saville <wink@google.com>
Mon, 13 Aug 2012 19:22:51 +0000 (12:22 -0700)
committerWink Saville <wink@google.com>
Mon, 13 Aug 2012 19:22:51 +0000 (12:22 -0700)
commite0e2ceb1ae025e6dd2adda75c32dba93c6dfeea4
tree262442e6df8b3f29976cce7e54a3e6033c185e65
parent59a96dd369b5c275b5e40105d71ed4c76d46f8b1
parent616b281b5a644d599bcc6b4bd75545b600eff45e
Merge commit '616b281b' into merge-conflict-TelephonySignal-Strength-cleanup

* commit '616b281b':
  Telephony: Signal Strength cleanup

Change-Id: I3c211a06c480169d90fb5bc2c1774bd509d91f87
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java