Merge "Increase post launch idle timeout to 60 secs" into nyc-dev

author Gopinath Elanchezhian <gelanchezhian@google.com>

Fri, 1 Apr 2016 18:37:22 +0000 (18:37 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 1 Apr 2016 18:37:23 +0000 (18:37 +0000)
author Gopinath Elanchezhian <gelanchezhian@google.com>
Fri, 1 Apr 2016 18:37:22 +0000 (18:37 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 1 Apr 2016 18:37:23 +0000 (18:37 +0000)
diff --cc tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
Simple merge
author	Gopinath Elanchezhian <gelanchezhian@google.com>
	Fri, 1 Apr 2016 18:37:22 +0000 (18:37 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 1 Apr 2016 18:37:23 +0000 (18:37 +0000)