Merge commit 'ff1e89fdd2cc535c3ce15f6a5bbc6c90a23bdb18' into HEAD
Bill Yi [Tue, 29 Apr 2014 18:34:19 +0000 (11:34 -0700)]
1  2 
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java