| commit | d46ca2b59a87bcb0ea90ec8c1f2d307f70b1ea52 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Fri Aug 25 20:34:06 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 25 20:34:06 2023 +0000 |
| tree | ba379bee1c3510e1e6e443ccac4c0e2c74041c91 | |
| parent | 7254a9d7cb83abe56974ef8f76cfb65dda86fb02 [diff] | |
| parent | 8e02a787971d460a6a3a479aa75a15591e948ade [diff] |
[automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am: 8e02a78797 -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: I099c5bbef8a2cef5723e48fe5208218f98568b5c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>