diff options
| author | 2023-10-30 21:04:53 +0000 | |
|---|---|---|
| committer | 2023-10-30 21:04:53 +0000 | |
| commit | 260277aa589ceeeb589eee0f4dacbea009bb3e8c (patch) | |
| tree | e24f1a9b80a1153bcad357de8ba133457208b15b /libs/androidfw/ApkParsing.cpp | |
| parent | 8689fa1e24688649a1f4e2e9feb8d51c14771756 (diff) | |
| parent | 58f23a8e53cfeb1ac23a9f8696de3567dcb66fa1 (diff) | |
Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e53
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922
Change-Id: I5eaa8157fac13a2c83308251003740beb13bf414
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