| commit | 8e02a787971d460a6a3a479aa75a15591e948ade | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Fri Aug 25 19:49:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 25 19:49:55 2023 +0000 |
| tree | 11a36977b5522b23720204388328493e595d158d | |
| parent | f72a53a5950c8cf087df6e38d05621cec807c474 [diff] | |
| parent | e86e47178e39040e2eda13390c9370dc03525824 [diff] |
[automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am skip reason: Merged-In I8ef4b7a3630535bde9eedb4da78ae3fee8e13234 with SHA-1 f72a53a595 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2716375 Change-Id: I923ab7b877922c32b5a67e6318e048899677f6a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>