| commit | 52cea92b6950ae711bb1009c21627029c62784f4 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 30 22:07:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 30 22:07:43 2023 +0000 |
| tree | ad0fd0c4c7cf2eaca1cf6c883bb7c7934a0f1f30 | |
| parent | 1433ccdd81062bc2d1034c5b268d690effc2d7a7 [diff] | |
| parent | 7be05ac3c64cddaa0937dd96162d177bc863aa53 [diff] |
[automerger skipped] Merge "activity(api): Flag nfc mainline API added for Android V" into main am: 58f23a8e53 am: 42431ea15c am: 7be05ac3c6 -s ours am skip reason: Merged-In If0b1432b78ec42a02446754ff6cf454fbb875048 with SHA-1 0ce1c1f991 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2802922 Change-Id: I16d94ad9f35344be32d270c4367c8f7dedb56351 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>