commit | 093195abeeaee48f5454cc5bf718eabcd29e40ad | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:25 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:25 2020 +0000 |
tree | e041eef0fff3530b2a2f426a3836119f3a279472 | |
parent | cdfe3fe967636fccf3b221e11d67adcd421e98aa [diff] | |
parent | 553e53040abb002e2021506f522362fc06c22ac2 [diff] |
[automerger skipped] Merge Android R am: cbbd712e06 -s ours am: 5d89fcbfa7 -s ours am: 8fa7b2f050 -s ours am: 553e53040a -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: I3b10f62c642066d6a30691f3fb95f65f026103b1