Commit 1eeb33e4 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by android-build-merger
Browse files

Merge "Revert "Increase timeout for getStringValue to 5 minutes."" am: 1c750dfe 

am: 6f0723cf

Change-Id: Ifd4de9e0676fc7ac23f89890605b44760f03978d
parents 1c9af7d1 6f0723cf
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment