tree 17f507746f8dd7ae877bbef17f377e0e3f884673
parent 43aa32deffa3991598b22fbefdcf3f33af7dd345
parent cff7d38b93fa447f68e3c514563c87918f27d825
author Zhuoyao Zhang <zhuoyao@google.com> 1507585927 +0000
committer android-build-merger <android-build-merger@google.com> 1507585927 +0000

Merge "Configure test timeout for hidlUnitTest"
am: cff7d38b93

Change-Id: Ibc218e3afea0a9a7e0b7494298d924f46a90ba10