diff options
| author | 2022-09-06 21:16:36 +0000 | |
|---|---|---|
| committer | 2022-09-06 21:16:36 +0000 | |
| commit | 043b90b360c32213bed1ba9e4d6936ad4e2657b2 (patch) | |
| tree | 074eb77aa0d9b6e0602c6be643a95ffb3805dca6 /libs/androidfw/ResourceTimer.cpp | |
| parent | 167fa8ba83823c8a2d5673d51fde661a18bd75ed (diff) | |
| parent | ef2a1d60bedbfb271c9aa8457abfb51e476e4119 (diff) | |
[conflict] Merge "Validate package name passed to setApplicationRestrictions." into qt-dev am: 0b5ceb8cd2 am: 9f864c4b23 am: ef2a1d60be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19861873
Change-Id: I90bd2588c585b4df998a800657bf1b583d23adee
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