Merge branch 'ib-chrome-platform-atmel-mxt-ts-device-properties' into working-branch...
authorBenson Leung <bleung@chromium.org>
Tue, 29 May 2018 06:03:59 +0000 (23:03 -0700)
committerBenson Leung <bleung@chromium.org>
Tue, 29 May 2018 06:04:10 +0000 (23:04 -0700)
commit1eb89893ecaae25b4e01a2efc3cfdfa07b1da3ab
treeca7ee73c8d671921b36fc6319dc3261b9ce0e024
parent485aa74a8e94d6ca7360a2fa75539d2e312815bf
parent5020cd29d8bfcb3f3add43ea7d58b07011ab96d8
Merge branch 'ib-chrome-platform-atmel-mxt-ts-device-properties' into working-branch-for-4.18

Signed-off-by: Benson Leung <bleung@chromium.org>