Merge commit '04b18ec' into merge2

2015-04-24 13:56:58 -07:00
parent d7b4b81274 04b18ec153
commit f491a5844a
1 changed files with 1 additions and 1 deletions
--- a/telecomm/java/android/telecom/ParcelableConference.java
+++ b/telecomm/java/android/telecom/ParcelableConference.java
@@ -130,7 +130,7 @@ public final class ParcelableConference implements Parcelable {
            int videoState = source.readInt();

            return new ParcelableConference(phoneAccount, state, capabilities, connectionIds,
-                    videoCallProvider, videoState);
+                    videoCallProvider, videoState, connectTimeMillis);
        }

        @Override