Commit a68b478f authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge changes I57f70381,I9f225825 

* changes:
  Fix cpplint issue.
  Fix crash when connected to DDMS
parents d30315ef f397866c
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