am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1

* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
tree: 09b9b21af72d3ec57979d8cde93c63b72e2db7cc
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. MODULE_LICENSE_APACHE2
  7. NOTICE