Commit 847734cc authored Mar 10, 2018 by Pengquan Meng Committed by android-build-merger Mar 10, 2018

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev...

Merge changes from topic "am-59911b1f-fa0c-400c-a3f8-812ac0a8762b" into oc-dev am: fe6a5c46 am: 5eb85f01
am: 03720668

Change-Id: If981740986af74936a82d496eab591d8009e3613

parents 2e94d509 03720668

telephony/java/com/android/internal/telephony/DcParamObject.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ public class DcParamObject implements Parcelable {
		}

		public void writeToParcel(Parcel dest, int flags) {
		dest.writeLong(mSubId);
		dest.writeInt(mSubId);
		}

		private void readFromParcel(Parcel in) {