commit | d3a85cd87a46bdc772beda7a0d46803395a4ddad | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Jun 08 17:25:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 17:25:05 2020 +0000 |
tree | be40b7667ddc7208092ee1f9425e97b90b06f359 | |
parent | e21f8ee6629ec6e37ae7feed17ee214bf07d0e18 [diff] | |
parent | 4b050de5e8021fbab5e78aa1d7188c9b393434c0 [diff] |
[automerger skipped] Merge QQ3A.200605.002 into master am: d5997fad37 -s ours am: 4c4eea7c1c -s ours am: b3fb8e6e10 -s ours am: 0ce5ded75d -s ours am: 4b050de5e8 -s ours am skip reason: Change-Id I166f80c6b6820c5be6f8a1139176a8f149a5e753 with SHA-1 37fbe0090a is in history Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/1323640 Change-Id: Ia2b31ae5db3802215f7d36e14b25802787c88df0