| commit | f9aa0769d6c63cc94b72c54b1191c0a4a223cc90 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Mon Aug 28 20:08:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 28 20:08:04 2023 +0000 |
| tree | 0333691f81a20a7a866cfa0826c46210f84e2fec | |
| parent | 81dab2522dde55f45b608e2cdeb38a40b206ecaf [diff] | |
| parent | cab76b2b15790fc7d2c3bc5c1ec915151fe45d51 [diff] |
[automerger skipped] Merge "Implement DISALLOW_NFC AE user restriction" into main am: a3f6a70e9b am: e86e47178e -s ours am: 8e02a78797 -s ours am: d46ca2b59a -s ours am: cab76b2b15 -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: I4aca732f9308161acd7a90e33739ffb471eea7c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>