diff options
| author | 2023-10-30 21:30:45 +0000 | |
|---|---|---|
| committer | 2023-10-30 21:30:45 +0000 | |
| commit | fb3169131ba00cb5b57da05a3a7e5a0980bd3324 (patch) | |
| tree | a3945bee1d7ecd518ba961d17c8aa8aa4f4a8d4e /libs/androidfw/ApkParsing.cpp | |
| parent | 7be05ac3c64cddaa0937dd96162d177bc863aa53 (diff) | |
| parent | 260277aa589ceeeb589eee0f4dacbea009bb3e8c (diff) | |
[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e53 am: 260277aa58 -s ours
am skip reason: Merged-In If0b1432b78ec42a02446754ff6cf454fbb875048 with SHA-1 af27dfc334 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922
Change-Id: I84b000cb975e2dbc54b611615e3b53042d7e107b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions