commit | 19f1b7514e38378ebdd69835597e93ba161d3c08 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Oct 30 21:31:35 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 30 21:31:35 2023 +0000 |
tree | d6068e3811dd7fac1f07ca0cc3d11db8638c0b13 | |
parent | 767ff4725ecaa0a6c2f43622e87f7a4bd56bc399 [diff] | |
parent | 3510cd0a6e27e93ad546c88dea2564fea9885008 [diff] |
[automerger skipped] Merge "settings(nfc): Remove NFC beam settings" into main am: e8df63f148 am: 3510cd0a6e -s ours am skip reason: Merged-In I40974a26d170cf3eeec18e6a07a21f6c420eca9e with SHA-1 ad565c49dc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2808364 Change-Id: I8cc0f159c9f47eb96fef3c32d2dc5d66a036c90d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>