diff options
| author | 2023-10-30 22:10:14 +0000 | |
|---|---|---|
| committer | 2023-10-30 22:10:14 +0000 | |
| commit | e4fd20a70a8d2bcd2b77638c227082f1775de83e (patch) | |
| tree | e30bea109fb70b41597ccd534703c9e901914b17 /libs/androidfw/ApkParsing.cpp | |
| parent | 19acdb0e97e3215e90c1e53f17053ab3798616c5 (diff) | |
| parent | fb3169131ba00cb5b57da05a3a7e5a0980bd3324 (diff) | |
[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e53 am: 260277aa58 -s ours am: fb3169131b -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: Ifce78dd60b08202fb3309698cdc9796f9476a77f
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