Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1b2ac60 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Set jni_uses_sdk_apis for NetworkStackTests" am:... 

[automerger skipped] Merge "Set jni_uses_sdk_apis for NetworkStackTests" am: ac7d9c6c am: 9b376a79 -s ours am: f9a5f97c -s ours am: 3f43a7ca -s ours am: d0fd3374 -s ours

am skip reason: Change-Id Ieff8acec71d206104033a04c049840fd94adfce9 with SHA-1 a5e9fe81 is in history

Change-Id: I6cbe579bb7f678d263a020b6abdf89aacbf937bf
parents 64b90605 d0fd3374
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment