| commit | fd0203ee281e0d1fc41578066dbe3cc017d385b6 | [log] [tgz] |
|---|---|---|
| author | Henri Chataing <henrichataing@google.com> | Wed Feb 22 19:36:01 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 22 19:36:01 2023 +0000 |
| tree | 15c8af6e380ad05a1db5705a50dc57303ee3bc29 | |
| parent | 8b0fa20c986c1b1af5586cdf7e6c44d6e62b2c6a [diff] | |
| parent | 6a7031515e5de306d6b6dd74bd59dfa27bea57a8 [diff] |
[automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205 Change-Id: I948a11f2df4444b9d64fed97fb661ea35f33e3ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>