tree 9f2232465e12ea02d458b7537d67d297020327c8
parent 5e11c110ee35f32a71f3a30b09ab7be8be976450
parent 75cfb6b035ca53fde363bad0389a28e048f27917
author Zhuoyao Zhang <zhuoyao@google.com> 1518457899 +0000
committer android-build-merger <android-build-merger@google.com> 1518457899 +0000

Merge "Convert keymaster hal test to use VtsHalHidlTargetTestEnvBase" am: eeeaaf5589 am: 6e4263fa6b
am: 75cfb6b035

Change-Id: I5a2b49315d74cc53b6205346e39d953826a15dab