diff options
| author | 2022-08-19 19:19:43 +0000 | |
|---|---|---|
| committer | 2022-08-19 19:19:43 +0000 | |
| commit | 2a64f63cd0a885d11f12865e7c1928e68acbe8d0 (patch) | |
| tree | 8a5fca08e278f408013e7f8e655484b2cd1dd453 /libs/androidfw/ResourceTimer.cpp | |
| parent | 0a38b2e9288ef14bbc801ff245224f44f5fb26f2 (diff) | |
| parent | 60007b586c852398faa21feea8270e323194d2f3 (diff) | |
Merge "[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 7053007275 -s ours am: b5c51a7b85 -s ours am: fe0441614e -s ours am: ae12973465 -s ours" into tm-d1-dev-plus-aosp am: e87a3ce8bd -s ours am: 60007b586c -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b73 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459103
Change-Id: I4112cbb2b0761d364aa194dd978fc2f8c640a9fe
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