Anton Hansson 024ea641db resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp ...

Bug: 171029603
Test: No
Change-Id: I94146ebaf21cabd54105059fee3f07ba4043aa76
Merged-In: I843efb4880b6caaf3872e9b0918fd710fb93d979

2020-10-30 17:02:14 +00:00

.prebuilt_info

…

apct-tests/perftests

Change perf-setup.sh to perf-setup in run.sh

2020-10-14 18:40:55 -07:00

apex

Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d

2020-10-20 20:31:58 +00:00

api

Merge "Add OEM_PRIVATE NetworkCapability" am: 7415f6f9b5 am: 32fbc09bd0 am: 689181f342

2020-10-28 00:10:47 +00:00

cmds

Merge "Support animation parts fading out" am: 21819ef3b6 am: 648a4c2ea4 am: 858986161e

2020-10-20 20:31:09 +00:00

config

…

core

resolve merge conflicts of 887f4fbc74 to rvc-qpr-dev-plus-aosp

2020-10-30 17:02:14 +00:00

data

Merge "Add read/write logic for SubscriptionPlan network types field"

2020-10-23 17:15:03 +00:00

docs

…

drm

…

errorprone

…

graphics

…

identity

…

keystore

Keystore SPI: Fix typos.

2020-10-22 21:03:32 -07:00

libs

Merge "Merge redfin/bramble support."

2020-10-19 23:20:09 +00:00

location

Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d

2020-10-20 20:31:58 +00:00

lowpan

…

media

Merge "Remove @TestApi from @SystemApi symbols" am: d2d4637685 am: cbe282347e am: 14897c256d

2020-10-20 20:31:58 +00:00

mime

…

mms

…

native

Make the connection between implementation and llndk_library explicit

2020-10-19 13:37:57 -07:00

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Restructure Module code [ com.android.tethering ]"

2020-10-30 08:41:36 +00:00

proto

…

rs

…

samples

…

sax

…

services

DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS flag for now to avoid crashes. am: 39150a7422

2020-10-30 13:19:49 +00:00

startop

Merge "Migrate away from deprecated Truth APIs." am: b65c13a7b9

2020-10-13 19:39:20 +00:00

telecomm

Merge "Modify the TelecomLoaderService to provide LocalServices to Telecom"

2020-10-26 15:59:36 +00:00

telephony

Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 am: 9149eab591

2020-10-30 10:04:13 +00:00

test-base

…

test-legacy

…

test-mock

Remove @TestApi from @SystemApi symbols

2020-10-19 16:41:01 +01:00

test-runner

…

tests

Merge "NetworkNotificationManager gets NotificationManager locally" am: a13966feea am: 0e2959a56b am: adfd73bd18

2020-10-30 11:25:49 +00:00

tools

Clarify error message when signature in list.txt does not exist.

2020-10-26 16:53:09 +00:00

wifi

Merge changes from topic "revert-1353490-revert-1323251-ipv6_prov_loss_quirk_parcelable-DVBHZDYMHA-MDHWFKJABZ" am: 8e8460b4b3 am: aa24ca0106 am: a88adc48fc

2020-10-29 06:50:05 +00:00

.clang-format

…

.gitignore

…

.mailmap

…

Android.bp

Merge changes from topic "bug_167962976_visibility"

2020-10-29 07:15:03 +00:00

Android.mk

…

ApiDocs.bp

…

CleanSpec.mk

…

framework-jarjar-rules.txt

…

METADATA

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

pathmap.mk

…

PREUPLOAD.cfg

…

StubLibraries.bp

Merge "Move non-updatable-api/ to core/api/"

2020-10-30 15:22:45 +00:00

TEST_MAPPING

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%