| commit | e2288b75b592969e5352ac304d0c28589e914a1c | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 21 09:21:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 21 09:21:19 2021 +0000 |
| tree | fd508b00a7874cdfa7c9dacbcb29b9c23b43d04a | |
| parent | 17304a67fd9e950c012c24f5ed766a89209d7404 [diff] | |
| parent | 4ccd2e2d87fd3029c434c04bafc328cb0fad1ac8 [diff] |
[automerger skipped] Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" into sc-dev am: 7e982787e1 -s ours am skip reason: Merged-In I2e3c4fe735b3374b2ff6d23850970e36c0aafda5 with SHA-1 6b1f3eaf12 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667143 Change-Id: Id39a25cc0292dcbdfc91df1347433f278f5954bd