tree 3c30d10a00ef9c004df53e4abe0f25f8db0b29df
parent 06815d6023f03f0169d67634b3ba10d60c33c7e2
parent 702d82fdc0d5cb9abc236660070a531bf4044db0
author Paul McLean <pmclean@google.com> 1499734697 +0000
committer android-build-merger <android-build-merger@google.com> 1499734697 +0000

Merge "Catch exception in descriptor parser causes device connection to be skipped." into oc-dr1-dev am: 22d4bf2283
am: 702d82fdc0

Change-Id: Ia45c777b095ff8c29042145fd11b29dcace24366