commit | b5ecb7ffecfe115b895e811c16dce0320e2eea0d | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 18 23:18:10 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 18 23:18:10 2023 +0000 |
tree | c126182d24834568b2392147abcda136934243a8 | |
parent | 7395cf107f94dd844f124086fe747b4cc80b30f4 [diff] | |
parent | 0ddb9fe6dc900319d5cbe7ee2e903b11a630826a [diff] |
[automerger skipped] Merge "Add NFC TagIntentAppPreference System API" am: ab5d84cf41 am: 86eb2a4411 am: 0ddb9fe6dc -s ours am skip reason: Merged-In I9d353cf794dbe7dbcbfeb3a8b37ef29fe86387f1 with SHA-1 a1feefc573 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2337344 Change-Id: Ie26a03b078c1841fc94574a1f190b89f719a8e24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>