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)
Signed-off-by: Benson Leung <bleung@chromium.org>

Trivial merge