tree ae0f5683367e8584a9a88f21fcc5c05ac8c99b1d
parent 12b8ba166736cb1497e3a9c14abe1607cfb04679
parent 1f9d80f6eebc26615e14fdbab5ee8461f70aa589
author Chalard Jean <jchalard@google.com> 1548376587 -0800
committer android-build-merger <android-build-merger@google.com> 1548376587 -0800

Merge "Fix IPMS tests timeout."
am: 1f9d80f6ee

Change-Id: Ia73f410da8c42e9933dd290deacb82909b4348a6