diff options
| author | 2022-09-06 15:59:58 +0000 | |
|---|---|---|
| committer | 2022-09-06 17:41:59 +0000 | |
| commit | ef2a1d60bedbfb271c9aa8457abfb51e476e4119 (patch) | |
| tree | f55115b77dd52c3f58d0806fe68c59bf4cf1d0e3 /libs/input/SpriteController.cpp | |
| parent | 8cfe99d2e5bd99e610aeef9a1234b131ce48aa18 (diff) | |
| parent | 9f864c4b23691e7a94f798f3bff93095df734ee7 (diff) | |
[conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19747771
Bug: 239701237
Change-Id: I8959a73760101a265c0796f8f262cecf40d0acdf
Merged-In: I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/input/SpriteController.cpp')
0 files changed, 0 insertions, 0 deletions