Anton Hansson 5aa8e25cdd Merge mainline-prod into master
$ git merge -s ours origin/mainline-prod

There are only two commits not from upstream:
a732b3a5a2
1be2664406a2e697044f483a44c547973f915e3d

But both of these are noops in master (due to Merged-In).

Bug: 168176832
Test: presubmit
Change-Id: Ic61fc2939b03615e152c37fd762dbcd81546f705
2020-09-10 08:18:00 +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%