tree c32dadd4eeb4f37fe4721c5e8a6b07de0bc4ac5a
parent 5a2831201c82401ba75d85add9b36ff90d5e7f82
parent c79f8df1a1e62633736823cb676bef30531765e0
author Keun-young Park <keunyoung@google.com> 1369959565 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369959565 -0700

am c79f8df1: Merge "WebView tests are failing with a timeout failure.Added timeout for the polling check. 	modified:   webkit/src/android/webkit/cts/WebViewClientTest.java" into jb-mr2-dev

* commit 'c79f8df1a1e62633736823cb676bef30531765e0':
  WebView tests are failing with a timeout failure.Added timeout for the polling check. 	modified:   webkit/src/android/webkit/cts/WebViewClientTest.java