OSDN Git Service

Merge "Catch exception in descriptor parser causes device connection to be skipped...
authorPaul McLean <pmclean@google.com>
Tue, 11 Jul 2017 00:51:18 +0000 (00:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 00:51:18 +0000 (00:51 +0000)
am: 22d4bf2283

Change-Id: I93f90134618fa282ccf7c8d0e2acedf37ee41446


Trivial merge