tree 53feae4691640c6b9366a8b97de26e12e921599c
parent 626a404968f65a2a99c5dcb4b1a28f5e006d45bf
parent efac2170d49f17ee4543cc79b1d594aff9a35f18
author Yifan Hong <elsk@google.com> 1523496186 -0700
committer android-build-merger <android-build-merger@google.com> 1523496186 -0700

Merge "lshal: allow 10s for passthroughManager()->debugDump" into pi-dev am: 1f0622ed97
am: efac2170d4

Change-Id: Ic88c96f3b6c50242f1e57dea174dd6403d0dee42