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

[automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am:... 

[automerger skipped] Merge "Add annotation for Vpn#getNetwork()" am: 8db8d890 am: d734d347 am: a1489017 -s ours

am skip reason: skip tag Change-Id Ic52864003fbebd9f4e95d43fefc2e168437b0122 with SHA-1 1ef9b4d4 is already in history

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

Change-Id: I9f037314105a92d95394f55058bdbdeefd05b9c9
parents 4e5a7bfa a1489017
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