diff options
author | Lucas Wei <lucaswei@google.com> | 2022-10-19 16:16:51 +0800 |
---|---|---|
committer | Lucas Wei <lucaswei@google.com> | 2022-10-19 16:17:29 +0800 |
commit | a831e60b357ba1521a71940d75ccd43d0456b159 (patch) | |
tree | b2c99ceb98a206d11d628b30a0a2550fed9fbb12 | |
parent | 3f5002a3f67ff79d0905edb1b03ac796aca958a6 (diff) | |
parent | ee02fbc52245ae1c06ad8032eb245c3ea8a737bf (diff) | |
download | novatek_touch-a831e60b357ba1521a71940d75ccd43d0456b159.tar.gz |
Merge android13-gs-pixel-5.10-gs101-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr2
Conflicts:
nt36xxx/nt36xxx_goog.c
Bug: 238399460
Change-Id: Id177af55e41eec61563d5b6b60fadd96eab237ad
Signed-off-by: Lucas Wei <lucaswei@google.com>
0 files changed, 0 insertions, 0 deletions