diff options
| author | 2023-09-13 18:05:10 +0000 | |
|---|---|---|
| committer | 2023-09-13 18:05:10 +0000 | |
| commit | b9a69e55bd479011c5cb259494b41869ddc79d34 (patch) | |
| tree | 63701252c5dde4f65f7b96a63881a3a9a2f08549 /libs/androidfw/AssetsProvider.cpp | |
| parent | 3e122d5efe79cbb69318293ea59d9d8ab781aa02 (diff) | |
| parent | dcfe521e029c855a4c2f6a0e4d21d87626a1ffb9 (diff) | |
[automerger skipped] Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into aosp-main-future am: 2d7cf7d4c5 -s ours am: dcfe521e02 -s ours
am skip reason: Merged-In I170a7b21ca63c8e655bfb1735e33c9b163ff3d72 with SHA-1 280994a57c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24734309
Change-Id: I492304d16f567cfbb10a90fbb6dae7053728acb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions