tree 13c6ad4a9feeabd8b9bc8cacf02d466920c265f2
parent cae0672d96591af5d76af3ccb1c58055af380005
parent c196ba00a970f577a4bca91ce610e9ad6679d92c
author Kyle Alexander <kylealexander@google.com> 1523405423 -0700
committer android-build-merger <android-build-merger@google.com> 1523405423 -0700

Merge "Update test timeout for OEMCrypto unit tests" into pi-dev
am: c196ba00a9

Change-Id: I4b652e1eac48e8f2dbf9c77d6eb47f21fc3ce458