Merge "VTS: fix VtsHalKeymasterV3_0Target issue"
authorIris Chang <iris.chang@mediatek.com>
Fri, 6 Oct 2017 01:49:29 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Oct 2017 01:49:29 +0000 (01:49 +0000)
am: 1912c73a7f

Change-Id: I781812c77d96a0a7beb832298df8d537ce1d55da


Trivial merge