Skip to content
Commit 5d1cff77 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()"... 

[automerger skipped] Merge "Set WifiAwareNetworkInfo into setTransportInfo()" am: 6056ec00 am: f28b2237 -s ours

am skip reason: Change-Id Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8 with SHA-1 190ce210 is in history

Change-Id: Icc020d872394b2bce4983b55a9fae96cff919c98
parents 7ace74ac f28b2237
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