Merge commit 'b21b57c0' into manualmerge
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Mar 2013 23:27:38 +0000 (16:27 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 15 Mar 2013 23:27:38 +0000 (16:27 -0700)
commit620c8855bcaa3fe8d492e93811b0ed6e8b4f59fc
tree92532192043eae7f99ed162ab6b5173c48786b09
parenta0f3a809d88e871ca5298b3c7aea2f4b5fc43839
parentb21b57c092b15952e1ad00305810ae114d27fd78
Merge commit 'b21b57c0' into manualmerge

Conflicts:
src/java/com/android/internal/telephony/uicc/SIMRecords.java

Change-Id: Ic998e70207851e7e00f56d6e8591e53834987358
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/SIMFileHandler.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java
src/java/com/android/internal/telephony/uicc/UsimFileHandler.java