Merge m-c to m-i
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 27 Jan 2014 14:32:21 -0800
changeset 181447 d58c365357fbe628861c123923a5bd1cdc517446
parent 181446 027074c4920776125cbe13738d5f493043e5c629 (current diff)
parent 181413 9ab72e2ec5e4bd2f1c1a9ff99ce40284bcb7813d (diff)
child 181448 95b42ba6b1d75401f25cf9af6dc41dfbe40a3d5c
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to m-i
--- a/dom/tests/mochitest/localstorage/mochitest.ini
+++ b/dom/tests/mochitest/localstorage/mochitest.ini
@@ -16,16 +16,17 @@ support-files =
   interOriginTest2.js
   localStorageCommon.js
 
 [test_appIsolation.html]
 [test_brokenUTF-16.html]
 [test_bug600307-DBOps.html]
 [test_bug746272-1.html]
 [test_bug746272-2.html]
+skip-if = os == "android" # bug 962029
 [test_cookieBlock.html]
 [test_cookieSession.html]
 [test_embededNulls.html]
 [test_keySync.html]
 [test_localStorageBase.html]
 [test_localStorageBaseSessionOnly.html]
 [test_localStorageCookieSettings.html]
 [test_localStorageEnablePref.html]