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

2014-09-15 12:40:02 -07:00

..

java

Merge commit 'e58e59cc' into fix-merge-conflict

2014-09-15 12:40:02 -07:00

jni

am 5dee9c9b: am 855fc8c7: Update icons to vectors, fix preload theming & vector tinting

2014-09-12 20:52:03 +00:00

res

Merge commit 'e58e59cc' into fix-merge-conflict

2014-09-15 12:40:02 -07:00

tests

Merge "temporarily enable wifi verbose logging in download manager test" into lmp-dev

2014-09-14 22:35:30 +00:00