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

Commit 3f43a7ca 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 skip reason: Change-Id Ieff8acec71d206104033a04c049840fd94adfce9 with SHA-1 a5e9fe81 is in history

Change-Id: I5f82ac8474f6ae52dc7a9328e8918a90b070893b
parents ad2f2829 f9a5f97c
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