tree e041eef0fff3530b2a2f426a3836119f3a279472
parent 316e24b8936e7c4a672c7bac3efa237bcd5a301b
parent cbbd712e067b94d7f916159e3cd73136dd160467
author Xin Li <delphij@google.com> 1599784854 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784854 +0000

[automerger skipped] Merge Android R am: cbbd712e06 -s ours

am skip reason: Change-Id I76a40f211cb9022b7ee1c372266c8cc1e2537e57 with SHA-1 316e24b893 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/1422530

Change-Id: I3def3aacd4ff8954710a0e802bedf27d7893c51b