Ryan Prichard 101ea2fc09 [automerger skipped] [RESTRICT AUTOMERGE] Undefine NAN before defining it again am: 4dcd87fbef -s ours am: 6daeb10167 -s ours am: ad200e7315 -s ours am: 5a83416f6a -s ours am: e1da1d87c6 -s ours ...

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743884

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

2023-09-07 23:46:41 +00:00

apexkey

…

atrace/1.0

…

audio

Remove unused file EffectWorker.h am: 5b8638c66c am: 2ee2dade75 am: 07a9fa87c6 am: 81b6b5d671 am: 7668deda92

2023-09-07 23:45:58 +00:00

authsecret

…

automotive

Merge changes I36d1e494,I65a74ac6 into main

2023-09-07 03:21:12 +00:00

biometrics

…

bluetooth

…

boot

…

broadcastradio

…

camera

…

cas

Merge "Migrate from android::String isEmpty to empty" into main am: 594656ed52

2023-09-07 18:04:54 +00:00

common

…

compatibility_matrices

…

configstore

…

confirmationui

…

contexthub

…

drm

…

dumpstate

…

fastboot

…

gatekeeper

…

gnss

…

graphics

Merge "Add deprecation note" into main

2023-09-07 20:15:54 +00:00

health

…

identity

…

input

…

ir

…

keymaster

…

light

…

media

…

memtrack

…

neuralnetworks

…

nfc

…

oemlock

…

power

…

radio

…

rebootescrow/aidl

…

renderscript/1.0

…

scripts

…

secure_element

…

security

…

sensors

…

soundtrigger

…

tests

…

tetheroffload

…

thermal

…

threadnetwork

…

tv

…

usb

…

uwb

…

vibrator

…

vr/1.0

…

weaver

…

wifi

Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 am: 3e5ee9a6e6 am: 5742e2ba25

2023-09-07 22:48:54 +00:00

.clang-format

…

.gitignore

…

Android.bp

…

CleanSpec.mk

…

current.txt

…

METADATA

…

NOTICE

…

OWNERS

…

PREUPLOAD.cfg

…

TEST_MAPPING

…

update-base-files.sh

…

update-makefiles.sh

…

Description

No description provided

134 MiB

Languages

C++ 56.3%

AIDL 41.2%

C 1.5%

Rust 0.4%

Java 0.4%

Other 0.1%