am d5ba9c22: Merge "resolved conflicts for merge of 17f95e92 to...
am d5ba9c22: Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit 'd5ba9c22':
remove the code that clears the passwords when the sim is replaced with a different one.