Skip to content
Commit d82907a8 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

[automerger skipped] Merge "Remove SocketUtils#setSocketTimeValueOption" into qt-dev am: 28fd3189 

am: 76a7fd2f -s ours
am skip reason: change_id If4a75f23c6c0589c23cadce3b088966649062463 with SHA1 77f9d85f is in history

Change-Id: I81e1f463e37076e7f91b05b8afc1399dabc9e158
parents 2857f1d6 76a7fd2f
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment