Jakub Pawlowski 7cd99c47bb resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I6cbbb7e2c680996bdd7b7f1d84bc14011451c7a5

2021-01-31 00:40:24 +01:00

.prebuilt_info

…

apct-tests/perftests

Create owners

2021-01-28 17:35:38 +00:00

apex

Merge "Migrate apex/permission to packages/modules/Permission" am: d985fe7b0e am: e515ed6824

2021-01-29 20:42:04 +00:00

api

…

boot

Add framework boot image

2021-01-28 14:53:49 +00:00

cmds

Return error in "sm unmount-app-data-dirs" if app data isolation is not enabled

2021-01-22 10:15:01 +00:00

config

Update boot image profiles OWNERS

2021-01-22 17:57:45 -08:00

core

resolve merge conflicts of 132a502721 to rvc-qpr-dev-plus-aosp

2021-01-31 00:40:24 +01:00

data

Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270

2021-01-30 02:52:14 +00:00

docs

…

drm

…

errorprone

…

graphics

…

identity

Identity Credential: API changes for Android 12

2021-01-21 17:42:14 -05:00

keystore

Merge "Keystore 2.0 SPI: Add back-off hint to BackendBusyException."

2021-01-28 20:39:01 +00:00

libs

Merge "Apply bilinear filter for Ninepatch."

2021-01-29 21:18:05 +00:00

location

…

lowpan

…

media

Merge "Remove __ANDROID_API__ #if checks." am: 1528efe4b1 am: 159155defe

2021-01-30 02:15:16 +00:00

mime

…

mms

…

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "add shell user permissions for Asistant GTS tests" am: 193dfa0a19 am: 7ebd138270

2021-01-30 02:52:14 +00:00

proto

…

rs

…

samples

…

sax

…

services

Merge "Introduce global package hibernation" am: 6857f6ed91 am: 95244bedc7

2021-01-30 02:30:14 +00:00

startop

…

telecomm

…

telephony

Merge "Throw IllegalStateException to fail fast in IMS" am: 7bbf421612 am: 0fb9491c10

2021-01-29 22:22:07 +00:00

test-base

…

test-legacy

…

test-mock

…

test-runner

…

tests

Merge "Allow system components to request underlying network policies." am: ba04ef8481 am: 89a75849c2

2021-01-29 23:22:47 +00:00

tools

Shift stringslint to using python3.

2021-01-22 22:07:30 +00:00

wifi

…

.clang-format

…

.gitignore

…

.mailmap

…

Android.bp

…

Android.mk

…

ApiDocs.bp

…

BATTERY_STATS_OWNERS

…

CleanSpec.mk

…

framework-jarjar-rules.txt

…

METADATA

Fix license_type. Contains GPL

2021-01-27 12:09:16 -08:00

MODULE_LICENSE_APACHE2

…

MULTIUSER_OWNERS

…

NOTICE

…

OWNERS

…

OWNERS.md

…

pathmap.mk

…

PREUPLOAD.cfg

…

StubLibraries.bp

Switch to new incompatibilities targets

2021-01-25 12:34:00 +00:00

TEST_MAPPING

…

ZYGOTE_OWNERS

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%