commit | a72d7d3c831c71d8cad1c31aa613023ef7e8dd2a | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Thu Jun 09 00:38:06 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Jun 09 00:38:06 2016 +0000 |
tree | 04efaea2939443de8c66e4c89f311583fa5ad56b | |
parent | df0c98071822df355e73e48364f93303202715eb [diff] | |
parent | 0354b47b28fcfbc36a8a71293234e5946c93955e [diff] |
Merge \\"Revert \\"Temporarily increase timeout for devices with buggy driver\\"\\" into nyc-dev am: e36da9c8c9 am: 0354b47b28 Change-Id: I5483919d199ab334717c353d3d4a4da2cda5dbe5