Wink Saville
02e3979d62
Merge commit 'e58e59cc' into fix-merge-conflict
* commit 'e58e59cc':
ksd to lmp-sprout-dev
Conflicts:
core/java/android/provider/CallLog.java
telephony/java/android/telephony/SubInfoRecord.java
telephony/java/android/telephony/SubscriptionManager.java
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ISub.aidl
telephony/java/com/android/internal/telephony/TelephonyIntents.java
Change-Id: I2b892b692743a7ccde55185a2b90135bf28408cd