Benedict Wong a8fa528628 [automerger skipped] Merge changes from topic "encap-api" into pi-dev ...

am: c37a5742a2  -s ours

Change-Id: I19ea85409c7b8653a734e74afc092959e91a0aad

2018-03-30 22:57:46 +00:00

core

Merge "Add OEM_PAID capability to system api" into pi-dev

2018-03-30 18:30:23 +00:00

services

Merge "Get application info in the correct user id" into pi-dev

2018-03-26 17:15:29 +00:00

tests/net

Merge "Mark networks with OEM_PAID always restricted" am: dbc568ceaf

2018-03-30 09:05:09 +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%