commit | 9cb1e1f9429824c7d01271e5936bc98a1fb8a687 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Mon Feb 01 16:43:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 01 16:43:26 2021 +0000 |
tree | b95c86836050a70107cd48147284e60444096a74 | |
parent | fe6baf7cde89dbc9219d02320b8960268608e819 [diff] | |
parent | 0b436cdd8e0580b23274449ff8a3893bee9cdf70 [diff] |
Merge "Revert "Expose IPsec tunnel APIs from @SystemApi to public APIs"" am: 8ff1b04433 am: 0b436cdd8e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564979 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I324ea0a931e3b8da4b0bd11ef550312a21156f1f