Skip to content
Commit b5ecb7ff authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add NFC TagIntentAppPreference System API" am:... 

[automerger skipped] Merge "Add NFC TagIntentAppPreference System API" am: ab5d84cf am: 86eb2a44 am: 0ddb9fe6 -s ours

am skip reason: Merged-In I9d353cf794dbe7dbcbfeb3a8b37ef29fe86387f1 with SHA-1 a1feefc5 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2337344



Change-Id: Ie26a03b078c1841fc94574a1f190b89f719a8e24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7395cf10 0ddb9fe6
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment