Commit c0c0fd95 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I1aa11f40,Ia707a806 into qt-dev 

* changes:
  Fix dumpstate tests
  dumpstate: Increase timeout for lshal
parents 840ee72c 84fde0fd
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment