tree 7491a9e350d83226e61e82455835dfffdfa7cbd2
parent 41e90912df0394afd6620696c09cea2a0a6cbd2a
parent 744cf62d3fc69ec5ec95b3af1b0cfda466f0c146
author Chalard Jean <jchalard@google.com> 1585105604 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585105604 +0000

[automerger skipped] Merge "Expose netId by adding getter API" am: dd9c1f56fc am: 63a9f58437 -s ours am: 744cf62d3f -s ours

am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 dc651f03da is in history

Change-Id: If69d39b0f065d668b248a10d1a59b43e2ae75f54