Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge m-c to inbound. a=merge

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-01-14 13:45:59 -05:00
commit 938928f50a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
b2g/config/dolphin/config.json
View File

@ -13,7 +13,8 @@
"public_upload_files": [
"{objdir}/dist/b2g-*.crashreporter-symbols.zip",
"{objdir}/dist/b2g-*.tar.gz",
"{workdir}/sources.xml"
"{workdir}/sources.xml",
"{objdir}/dist/b2g-update/*.mar"
],
"zip_files": [
["{workdir}/out/target/product/scx15_sp7715ga/*.img", "out/target/product/scx15_sp7715ga/"],

1
mobile/android/base/tests/robocop.ini
View File

@ -112,6 +112,7 @@ skip-if = android_version == "10"
[testOfflinePage]
[testOrderedBroadcast]
[testOSLocale]
skip-if = processor == "x86" # Bug 1088708
[testResourceSubstitutions]
[testRestrictedProfiles]
[testSharedPreferences]