diff options
| author | 2022-10-26 01:31:05 +0000 | |
|---|---|---|
| committer | 2022-10-26 01:31:05 +0000 | |
| commit | 1a1985de7421dc9db9f2b91147b93d684a427f62 (patch) | |
| tree | 671460d0e54bdbb500a987067afe59123443a360 /libs/androidfw/ResourceTimer.cpp | |
| parent | cb4c267a13ca5639e13d5096af471f1ca40581ab (diff) | |
| parent | e42bde8d66ba44f40085a8f8d8b712b63faf5058 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE Validate permission tree size on permission update" into qt-dev am: 2d9de7b6ef am: 19a62f65cb -s ours am: 18ab349ff5 -s ours am: 5cd1e01215 -s ours am: 3f6e0cb4fe -s ours am: 1060177f55 -s ours am: 0bccaaedcf -s ours am: e70050c788 -s ours am: e42bde8d66 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20103164
Change-Id: Ibb71a2b17d0993df9797cc34256c02fcf47d9903
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