Commit a96eb47a 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 

am: 1eeb33e4

Change-Id: I690f4330a379bfcc649548fe29337e41f2f998c3
parents 0fa252dd 1eeb33e4
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