Commit 203545a6 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge changes from topic "socket_peer_is_trusted" 

am: 7d1c0491

Change-Id: Ie9e595da8563008b838d087f11fc6e69701268d2
parents fda15c18 7d1c0491
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment