TreeHugger Robot 440fa3ba6d [automerger skipped] Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" into sc-dev am: 7e982787e1 -s ours ...

am skip reason: Merged-In I2e3c4fe735b3374b2ff6d23850970e36c0aafda5 with SHA-1 cf4d2eb208 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14667143

Change-Id: Id39a25cc0292dcbdfc91df1347433f278f5954bd

2021-05-21 09:21:19 +00:00

core/java/android

Merge "Improve documentation of IpSecTunnelInterface#setUnderlyingNetwork" am: 5c20637731 am: 38a2af81f5

2021-05-20 21:22:32 +00:00

services

Merge changes I3ba50cbd,I970ee365 am: 37f2408143 am: 2710ae1348

2021-05-15 17:24:42 +00:00

Description

android_packages_modules_Connectivity

189 MiB

Languages

Java 81.4%

Kotlin 7.7%

AIDL 4.5%

C++ 4.5%

C 1.7%

Other 0.1%