am 028bb2ef: (-s ours) am 2084300a: DO NOT MERGE Treat adb device info parse failures...
authorPyry Haulos <phaulos@google.com>
Tue, 18 Nov 2014 20:18:25 +0000 (20:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Nov 2014 20:18:25 +0000 (20:18 +0000)
commit19a23e05a2f467001d434fed1cbed421e7d3f599
tree8f05d644715c21493a603c979f77b179dfa4d476
parentf34763628fbe215e58517ef06c34bcdc459320d4
parent028bb2ef30773d7efcf50dc0e6da2ed107e8a7c7
am 028bb2ef: (-s ours) am 2084300a: DO NOT MERGE Treat adb device info parse failures as warnings

* commit '028bb2ef30773d7efcf50dc0e6da2ed107e8a7c7':
  DO NOT MERGE Treat adb device info parse failures as warnings