[automerger skipped] Merge "Override gtest timeout and add logging" am: cb844d5695 am: 65eddf19ba -s ours am: 478757a955 -s ours

am skip reason: Change-Id I0825305258bae20ea6e13e9b9a65ce30b7153611 with SHA-1 fffbdfa1eb is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1352902

Change-Id: Iba5202cf18f5b5786e6a620ac6a72de46ba6ba14
This commit is contained in:
Jordan Liu
2020-06-30 20:18:01 +00:00
committed by Automerger Merge Worker

Diff Content Not Available