Commit 87cfe7b4 authored by Michael Rosenfeld's avatar Michael Rosenfeld Committed by android-build-merger
Browse files

Merge "Made app launch timeout configurable and defaults to 30 seconds." am: 5e44e6ef 

am: 3cb1bdcc

Change-Id: I1c63e461edde60a926a569c8133347a49544dbfc
parents 6560197e 3cb1bdcc
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