| commit | cab76b2b15790fc7d2c3bc5c1ec915151fe45d51 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Fri Aug 25 21:07:35 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 25 21:07:35 2023 +0000 |
| tree | dcb2c46f12e80eb4b526c176bdf96528538332c9 | |
| parent | bae3928e90f77f46c78359faad8ffdbe9c9655be [diff] | |
| parent | d46ca2b59a87bcb0ea90ec8c1f2d307f70b1ea52 [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 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: Ifc88d90d8a6d7c6210cd6391e9ce7fa06fc73849 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>