Joshua Mccloskey 83d28ff707 [automerger skipped] Merge "Updated keyguard to be robust against fpm" into tm-d1-dev am: 2da48dba91 -s ours ...

am skip reason: Merged-In If51313b03dc40442ad6c42603f77579e77b0c873 with SHA-1 d2a790740b is already in history

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

Change-Id: I65890595300454d8e7b4c52476337ca6ca0a1f7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-08-09 20:16:40 +00:00

.prebuilt_info

…

apct-tests/perftests

…

apex

…

api

…

boot

…

cmds

…

config

…

core

Merge changes from topic "desktop-windowing-flags" into tm-qpr-dev

2022-08-09 01:44:18 +00:00

data

…

docs

…

drm

…

errorprone

…

graphics

…

identity

…

keystore

…

libs

Merge "Update the min/max allowed pip size on aspect ratio change." into tm-qpr-dev

2022-08-09 17:53:55 +00:00

location

…

lowpan

…

media

…

mime

…

mms

…

native

…

nfc-extras

…

obex

…

omapi

…

opengl/java

…

packages

Merge "Take home controls setting into account" into tm-qpr-dev

2022-08-09 20:05:04 +00:00

proto

…

rs

…

samples

…

sax

…

services

Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d11828b

2022-08-09 17:22:59 +00:00

startop

…

telecomm

…

telephony

…

test-base

…

test-legacy

…

test-mock

…

test-runner

…

tests

…

tools

…

wifi

…

.clang-format

…

.gitignore

…

.mailmap

…

Android.bp

…

Android.mk

…

ApiDocs.bp

…

BATTERY_STATS_OWNERS

…

CleanSpec.mk

…

framework-jarjar-rules.txt

…

GAME_MANAGER_OWNERS

…

INPUT_OWNERS

…

lint-baseline.xml

…

METADATA

…

MODULE_LICENSE_APACHE2

…

MULTIUSER_OWNERS

…

NOTICE

…

OWNERS

…

OWNERS.md

…

PACKAGE_MANAGER_OWNERS

…

pathmap.mk

…

PREUPLOAD.cfg

…

ProtoLibraries.bp

…

StubLibraries.bp

…

TEST_MAPPING

…

TestProtoLibraries.bp

…

TRACE_OWNERS

…

ZYGOTE_OWNERS

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%