Paul Hu 29bccff63b Merge "Centralize nsd associated files" am: 32942299d3 am: 9238a7c49e am: 80425b7eeb ...

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

Change-Id: I034a8fb021c06e0a46b0baa55f6484624f843acd

2021-12-02 10:21:49 +00:00

..

api

Merge "Move adjacent tasks forward together to ensure occluding state" into sc-v2-dev am: 642ead3a05

2021-12-02 08:33:51 +00:00

java

Merge "Centralize nsd associated files" am: 32942299d3 am: 9238a7c49e am: 80425b7eeb

2021-12-02 10:21:49 +00:00

jni

Merge "Fix GL memory not being removed from lost RAM" into sc-v2-dev

2021-11-29 20:38:12 +00:00

proto

Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918

2021-11-18 17:00:37 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2021-11-29 14:43:49 +00:00

sysprop

…

tests

Merge "ForegroundServiceDidNotStartInTimeException now has..." into sc-v2-dev am: b344d33561

2021-11-30 16:47:10 +00:00

xsd

…

TEST_MAPPING

…