tree 146541e0169ef76ad7eadc0fcb2d65c17ebd349f
parent 707258b232104780f2ff43b75365c80f6a080b21
parent 4ff1a7dba24daf589651df2a8d26a0cccc872972
author Zhuoyao Zhang <zhuoyao@google.com> 1518208500 +0000
committer android-build-merger <android-build-merger@google.com> 1518208500 +0000

Merge "Convert oemlock hal test to use VtsHalHidlTargetTestEnvBase" am: 7e5c008f60
am: 4ff1a7dba2

Change-Id: I759e07640c74137d5480af73a9b41c974101ab22