diff options
| author | 2022-09-07 23:15:56 +0000 | |
|---|---|---|
| committer | 2022-09-07 23:15:56 +0000 | |
| commit | 7a601f8e70a453f4f0dd3b96bdd347f369cf1634 (patch) | |
| tree | 0b3534d7d64ad375b67d1237784938d690d195ee /libs/androidfw/ResourceTimer.cpp | |
| parent | de3c7fc60b569f2338358f1fdf94c7063a046341 (diff) | |
| parent | b62eeefe44f8c9b4751b6fb1376b600d96bcb5da (diff) | |
Merge "[conflict] [conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be am: 043b90b360" into sc-dev am: b62eeefe44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19874087
Change-Id: Id871c5a6615a72b018a19f8c17fa37bc152113bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions