Skip to content
Commit dae90d76 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Move VPN JNI to the bottom of srcs" am: 64512597... 

[automerger skipped] Merge "Move VPN JNI to the bottom of srcs" am: 64512597 am: 2442a584 am: d60841c6 am: 5352582f -s ours

am skip reason: Change-Id I3ab497f2133c9020131ca4392f34aedb8da99cc9 with SHA-1 3fcb538e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1479481

Change-Id: I4b95447ecb5b536a697a61662dc3d8345592da25
parents ade1d2a6 5352582f
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