am 33344796: Merge commit \'6bc40988\' into fix-merge-conflict
authorWink Saville <wink@google.com>
Fri, 19 Sep 2014 04:10:03 +0000 (04:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 04:10:03 +0000 (04:10 +0000)
commitdd274ce746f447d57ecb96a12d163c1c1f82d7a6
tree24e6a26ddc14a5dca1a363547a5b0ff33a4e7d12
parent8701c6ff803ffa0baac212ed610621f8d89c0f07
parent33344796c787ee6000c35f59f21c3de282d7eef5
am 33344796: Merge commit \'6bc40988\' into fix-merge-conflict

* commit '33344796c787ee6000c35f59f21c3de282d7eef5':
  ksd to lmp-sprout-dev
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java