tree 7d6581d468a90724886266fae0e69fe927e44700
parent ae6fa514a8ed084f081bb3d24c63cbc472502e3b
parent 82d6654ade066f8c3e3018fb7e1fc82c96604a74
author Kevin Rocard <krocard@google.com> 1573235487 -0800
committer android-build-merger <android-build-merger@google.com> 1573235487 -0800

Merge changes from topic "upstream-hal-v6"
am: 82d6654ade

Change-Id: Id139d689d7afb0aa0c23501cd771060b2f87b677