Merge branch 'master' of git://git.ti.com/tas2557sw-android/tas2557-ftc master
authorTracy Yi <tracy-yi@ti.com>
Mon, 28 Jan 2019 11:56:08 +0000 (19:56 +0800)
committerTracy Yi <tracy-yi@ti.com>
Mon, 28 Jan 2019 11:56:08 +0000 (19:56 +0800)

Trivial merge