tree dda43ad7a2b096d9f8e823a851b6ebc20ae8b305
parent d30315ef5ce124a83ef4a8d402608f63b0190141
parent f397866ce6d446d3ec5d12a6d002a3ee2d34b9c7
author Brian Carlstrom <bdc@google.com> 1410463739 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1410463739 +0000

Merge changes I57f70381,I9f225825

* changes:
  Fix cpplint issue.
  Fix crash when connected to DDMS