tree 0e42916faf6cf270f85ef86b56d0613bd832d7cd
parent eddff838c406a3a2fd11daf0c8687ec839f08e79
parent 9242a7c7fd935dfc184544718d00cb0e54336264
author yidong.zhang <yidong.zhang@unisoc.corp-partner.google.com> 1537547581 -0700
committer android-build-merger <android-build-merger@google.com> 1537547581 -0700

Merge "Increase VTS GetHalService test timeout" into pie-vts-dev
am: 9242a7c7fd

Change-Id: Ic62538cec7df8885fc5ccb502eb78ee064f1eb1c