tree 7a4f22825917c497fcbf7ee5fc09699028245d51
parent 85b3e385edaf5bc59fe536db82758766cb19005b
parent b6fe81f8b4d6242fae338da44dbb1da228da37b3
author Roshan Pius <rpius@google.com> 1699486233 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699486233 +0000

[automerger skipped] Merge "Revert "redbull: Replace NFC app with NFC apex"" into main am: 7836246080 am: e98cd7e639 am: b6fe81f8b4 -s ours

am skip reason: Merged-In I3cae59c33073df2c7f6a1546db72b4ed8478814a with SHA-1 a1a475d8ad is already in history

Original change: https://android-review.googlesource.com/c/device/google/redbull/+/2818764

Change-Id: I787850233b0aacb33e8528bd680658fa86c1488c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>