Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp * commit '34619494e009d998f5c073145c0481e38bbd2bcf': Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.
Merge commit '34619494e009d998f5c073145c0481e38bbd2bcf' into eclair-plus-aosp * commit '34619494e009d998f5c073145c0481e38bbd2bcf': Fix appcache layout test that was timing out due to race condition in WebView::addJavascriptInterface.