Learn more about cloning repositories
You have read-only access
Merge branch 'readonly-p4-master' Conflicts: telephony/java/com/android/internal/telephony/gsm/RIL.java resolved by removing gsm/RIL.java