Merge commit 'f606e5cc' into fix-merge-conflict

* commit 'f606e5cc':
  RIL: Correct the RIL_REQUEST_DIAL api missmatch

Conflicts:
	src/java/com/android/internal/telephony/RIL.java

Change-Id: Ib2b477628e14ca221acad35f4a2cf9a44170a33e

parents 2c74d79c f606e5cc

src/java/com/android/internal/telephony/RIL.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -887,7 +887,6 @@ public final class RIL extends BaseCommands implements CommandsInterface {

		rr.mParcel.writeString(address);
		rr.mParcel.writeInt(clirMode);
		rr.mParcel.writeInt(0); // UUS information is absent

		if (uusInfo == null) {
		rr.mParcel.writeInt(0); // UUS information is absent