Chavi Weingarten caff4c4c32 Merge "Allow canceled draws to get retried for sync" into tm-qpr-dev am: de765a95ea ...

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

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

2022-07-01 13:27:08 +00:00

..

api

Merge "Add API to set launch TDA featureId in options" am: 362e1c6eb4 am: 159473f75a am: 93c848722a am: 945bb0323e

2022-06-30 11:07:50 +00:00

java

Merge "Allow canceled draws to get retried for sync" into tm-qpr-dev am: de765a95ea

2022-07-01 13:27:08 +00:00

jni

Merge "Require CONFIG_HID_PLAYSTATION for DualSense key layout"

2022-06-22 15:27:58 +00:00

proto

Merge "Dump start and end transaction ids" into tm-qpr-dev am: f81f314c4c

2022-06-16 15:17:19 +00:00

res

Import translations. DO NOT MERGE ANYWHERE

2022-06-29 13:13:49 -07:00

sysprop

…

tests

Merge "Revert "Update the activity current config only if it is reported"" into tm-qpr-dev am: 362a8f75c1

2022-06-30 17:59:16 +00:00

xsd

…

TEST_MAPPING

…