diff options
| author | 2024-08-14 18:51:04 +0000 | |
|---|---|---|
| committer | 2024-08-14 18:51:04 +0000 | |
| commit | 1cfdba690fe8eafeb733e8f067e5b22843b4805e (patch) | |
| tree | e16c03e3366a7c3ab201f486fddfe1c45b4fda3a /tools/aapt2/ResourceTable.cpp | |
| parent | c290de667d3de08281fd387126eef6bf170cd635 (diff) | |
| parent | 6ee0eb75329c89535301db43974d825741e2d7ac (diff) | |
[automerger skipped] Merge "Add an intent action for Non-payment NFC services settings" into main am: 991a9dfd5e am: 6ee0eb7532 -s ours
am skip reason: Merged-In Iebe0e35af2e2712b11c93a2f29cabb3b5ed21d9d with SHA-1 7e31cfadca is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3216735
Change-Id: Ib957b332e1eced35b293bfad778bf8eddf2ae52c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions