TreeHugger Robot 7e79183136 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8b2a8cd445 -s ours ...

am skip reason: subject contains skip directive

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

Change-Id: I2edce8d794ff8e71af5f3423ede65ee5a1d8271c

2021-04-16 22:27:47 +00:00

.prebuilt_info

…

apct-tests/perftests

…

apex

Merge "Exempting prioritized alarms from min_window" into sc-dev

2021-04-15 21:06:12 +00:00

api

Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f am: 78f9593ff7

2021-04-12 20:59:22 +00:00

boot

Merge "Avoid duplication of compat team email addresses in OWNERS" am: 2435cbfde7 am: 9a4f3c85be am: 6ef49b92d1

2021-04-14 18:34:07 +00:00

cmds

Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE

2021-04-13 19:36:45 -07:00

config

Merge "Remove unnecessary entries in frameworks/base/config/OWNERS" am: a2baa71441 am: e9ec371853 am: a8329471e4

2021-04-09 01:05:37 +00:00

core

Merge "Add cancellationSignal to the Translator#translate() api." into sc-dev am: 7ae022ade8

2021-04-16 21:17:56 +00:00

data

Merge "Grant shell missing permissions" am: 51e5e80876 am: e2919bf071

2021-04-15 02:16:04 +00:00

docs

…

drm

…

errorprone

Merge changes from topic "apr10" into sc-dev am: cd5c179783

2021-04-15 14:05:16 +00:00

graphics

Move sparkle animation to RenderThread

2021-04-15 15:26:32 -07:00

identity

…

keystore

…

libs

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev

2021-04-16 17:06:51 +00:00

location

…

lowpan

…

media

Merge "Force FilterClient to NOT reset the FMQ pointer when creating the MQ" into sc-dev am: 0aa9d38e9d

2021-04-16 18:51:46 +00:00

mime

…

mms

…

native

Merge "Revert^2 "Remove setFrame from surface_control setGeometry"" into sc-dev

2021-04-12 13:51:01 +00:00

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev

2021-04-16 21:51:11 +00:00

proto

NAS Settings Migration

2021-04-09 11:21:33 -07:00

rs

…

samples

…

sax

…

services

Merge "Use caller's user id for recent caller info" into sc-dev am: deb3b21eb3

2021-04-16 22:07:04 +00:00

startop

…

telecomm

Merge "Add non-flaky telephony cts as presubmit using test mapping"

2021-04-15 17:04:17 +00:00

telephony

Merge "Revert "[ANAPIC Review] Change the type of List by ANAPIC review"" into sc-dev am: 98f5053d03

2021-04-16 21:19:05 +00:00

test-base

…

test-legacy

…

test-mock

…

test-runner

…

tests

Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev am: e12ebbb9cc

2021-04-16 16:24:37 +00:00

tools

Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b82853357b am: 89aedd6cb8 am: af77c134d9

2021-04-16 16:15:32 +00:00

wifi

wifi: Rename country change API

2021-04-15 15:13:04 +08:00

.clang-format

…

.gitignore

…

.mailmap

…

Android.bp

Merge changes from topics "based", "jref" into sc-dev am: 5683fda342

2021-04-13 12:15:28 +00:00

Android.mk

…

ApiDocs.bp

…

BATTERY_STATS_OWNERS

…

CleanSpec.mk

…

framework-jarjar-rules.txt

…

METADATA

…

MODULE_LICENSE_APACHE2

…

MULTIUSER_OWNERS

…

NOTICE

…

OWNERS

Move framework proto build rules to separate file

2021-04-12 18:39:20 +01:00

OWNERS.md

…

pathmap.mk

…

PREUPLOAD.cfg

Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b82853357b am: 89aedd6cb8 am: af77c134d9

2021-04-16 16:15:32 +00:00

ProtoLibraries.bp

enum migration

2021-04-13 15:24:22 -07:00

StubLibraries.bp

Merge "Add visibility rules to StubLibraries.bp" am: 6c57d63fcd am: d30fc17ddd am: 8a19796728

2021-04-16 10:11:31 +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%