diff options
| author | 2023-08-29 19:53:50 +0000 | |
|---|---|---|
| committer | 2023-08-29 19:53:50 +0000 | |
| commit | f9d32fd76829e497c33123a117fe2ddcb5cb68e5 (patch) | |
| tree | e9d5af98ed6ef993b3e85ac8628cf6ccafa94159 /tools/aapt/ResourceTable.cpp | |
| parent | c37974b34c884ada15146b6c0ae327573261b190 (diff) | |
| parent | f32dc8d349133b74f35746a5ebc7ede36bfa101c (diff) | |
[automerger skipped] Merge "Revert^2 "Lifecycle has to use kotlin syntax"" into udc-dev-plus-aosp am: 38e9c2e9d6 am: f32dc8d349 -s ours
am skip reason: Merged-In I170a7b21ca63c8e655bfb1735e33c9b163ff3d72 with SHA-1 08e2fd0c4a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24422866
Change-Id: Iecac80e62538c021ecfa070117bb9163231b1097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions