tree 57e4cd87bf53ea49ae69ea15e475a1dd4aa1501a
parent eff8ed36b4e2913388a442c70e78bd622143eeab
author Johan Torås Halseth <johanth@google.com> 1493804586 +0100
committer Johan Torås Halseth <johanth@google.com> 1493804663 +0100

Increase timeout for ADB backup/restore of SharedStorage.

This is a manual merge of ag/2161962 into master.

Test: it compiles.

Change-Id: Ice6648554933baf76e96fd151b506564487c91c6