diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-24 13:56:58 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-24 13:56:58 -0700 |
| commit | f491a5844a2ee989e4a0aa109c62fa62ad07737f (patch) | |
| tree | a805f5ac9102982abf502e37beab0312b8d18116 /telecomm | |
| parent | d7b4b81274e8a0f885be553ea8e153ea5447798d (diff) | |
| parent | 04b18ec15359b79b832ec50010f050d7298e7fb5 (diff) | |
| download | frameworks_base-f491a5844a2ee989e4a0aa109c62fa62ad07737f.zip frameworks_base-f491a5844a2ee989e4a0aa109c62fa62ad07737f.tar.gz frameworks_base-f491a5844a2ee989e4a0aa109c62fa62ad07737f.tar.bz2 | |
Merge commit '04b18ec' into merge2
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableConference.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/ParcelableConference.java b/telecomm/java/android/telecom/ParcelableConference.java index ab82549..6a221e6 100644 --- 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 |