Commit Graph

12566 Commits

Author SHA1 Message Date
Nick Alexander
d0cb9b8bce Bug 915312 - Follow-up: Land background JUnit 3 tests. r=nalexander 2014-03-10 20:53:43 -07:00
Richard Newman
b7b8661e41 Bug 945429. r=wesj 2014-03-10 16:12:52 -07:00
Chenxia Liu
40f9a95f82 Bug 977980 - Add "Remove" as an option for dynamic Home panels. r=margaret 2014-02-13 15:33:46 -08:00
Michael Comella
84db67d001 Bug 976833 - Override JUnit methods in UITest. r=lucasr 2014-03-06 16:42:26 -08:00
Ryan VanderMeulen
481593de88 Merge fx-team to m-c. 2014-03-10 17:10:25 -04:00
Chenxia Liu
a8ce1fcb55 Bug 976925 - UI after adding a Home Panel from Settings. r=lucasr 2014-03-10 09:37:36 -07:00
Robert O'Callahan
f87fd81842 Bug 975931. Part 11: Make nsDOMWindowUtils::SetDisplayPortForElement take a priority parameter, and set that parameter to 1 in reftests to override automatic displayport selection. r=kats
--HG--
extra : rebase_source : 07dcbfb67cb2db0bbb26a959517bbbdebd84f10b
2014-03-08 22:25:15 +13:00
Josh Dover
9a954e8950 Bug 966047 - Hide banner when there are no panels enabled. r=lucasr 2014-02-24 17:05:52 -08:00
Eugen Sawin
5bbbe857fc Bug 981345 - Fix HelperApp callback regression. r=wesj 2014-03-10 03:06:53 +01:00
Phil Ringnalda
29c6781b1d Merge f-t to m-c 2014-03-08 17:41:33 -08:00
Chenxia Liu
e25c1e0bfa Bug 965606 - Part 2: Update tests for new string and nested preference panels. r=margaret 2014-03-07 15:28:56 -08:00
Chenxia Liu
5d411bd290 Bug 965606 - Part 1: Give users the choice to only sync home panel data when on wifi. r=margaret 2014-03-07 15:28:51 -08:00
Chenxia Liu
63be995458 Bug 965606 - Part 0: Change home sync pref name, and type from boolean to ints. r=margaret 2014-03-07 15:28:48 -08:00
Margaret Leibovic
f2bd7a57c1 Bug 975469 - Remove sync promo banner from rotation after it has been tapped. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
d6625e0444 Bug 975239 - (Part 4) Don't show the banner again for the rest of the app lifetime after the user taps the close button. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
687be40d19 Bug 975239 - (Part 3) Refactor HomeBanner.handleMessage to handle being called multiple times. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
a23eb66424 Bug 975239 - (Part 2) Request a home banner message when the HomePager loads. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
875eb9015a Bug 975239 - (Part 1) Choose a banner message at random instead of rotating through a queue. r=bnicholson 2014-03-07 11:23:26 -08:00
Ryan VanderMeulen
eacebe7794 Backed out changeset 749fb9b52dd7 (bug 976833) for robocop failures on all platforms.
CLOSED TREE
2014-03-07 13:37:27 -05:00
Brian Nicholson
388bc5f140 Bug 976426 - Update progress on LOCATION_CHANGE and LOADED only if tab is loading. r=lucasr 2014-03-07 09:54:52 -08:00
Lucas Rocha
b1450f701e Bug 967742 - Consolidate API to edit HomeConfig state (r=margaret) 2014-03-07 17:15:31 +00:00
Brian Nicholson
f9b8beb9cd Bug 980438 - Make progress bar thinner and darker. r=lucsar 2014-03-07 09:03:42 -08:00
Michael Comella
f55c17c347 Bug 976833 - Override JUnit methods in UITest. r=lucasr 2014-03-07 08:52:55 -08:00
Wes Johnston
e2958d9688 Bug 960146. r=kats 2014-03-07 08:32:22 -08:00
Wes Kocher
83398347ef Merge m-c to inbound 2014-03-07 17:39:52 -08:00
Geoff Brown
ada892d8f0 Bug 945395 - Disable testSessionOOMSave on Android 2.3 2014-03-07 17:24:40 -07:00
Geoff Brown
1cc142904e Bug 981173 - Wait for Gecko:Ready in testReadingListProvider; r=sola 2014-03-07 17:24:40 -07:00
Chris Lord
a2a7f276b8 Bug 960146. r=kats,wesj 2014-02-20 09:36:48 -05:00
Mark Capella
c8947c7243 Bug 978731 - Cursor position jumps around, dragging handles moves text, r=wesj 2014-03-06 22:14:22 -05:00
Chenxia Liu
7cbe4c8a56 Bug 973039 - Display message in HomePanelPicker when no Home panels are available for install. r=margaret 2014-02-13 11:46:48 -08:00
Michael Comella
d175adb86c Bug 976775 - Rename AssertionHelper assertions to fAssert*. r=lucasr 2014-03-06 15:50:52 -08:00
Wes Johnston
9a4601f6d8 Bug 942611 - Fix missing parameter qualifier. r=rewman CLOSED TREE 2014-03-06 12:57:42 -08:00
Wes Johnston
4582386da0 Bug 942611 - Delete old temp files onPause. r=rnewman 2014-03-06 12:23:54 -08:00
Wes Johnston
67aff8f6c5 Bug 942611 - Delete temp files when tabs are closed. r=rewman 2014-03-06 12:23:53 -08:00
Wes Johnston
bfa9a38eda Bug 942611 - Store temp files in Android's cache dir. r=rewman 2014-03-06 12:23:52 -08:00
Michael Comella
220386026f Bug 915312 - Part 4: Test native crypto. r=rnewman,nalexander 2014-03-06 12:10:54 -08:00
Michael Comella
a531628bad Bug 915312 - Part 3: Add NativeCrypto Java interface. r=nalexander 2014-03-06 12:10:54 -08:00
Margaret Leibovic
01dca21687 Bug 974925 - Change snippets error message into a log message. r=bnicholson 2014-03-06 09:25:08 -08:00
Margaret Leibovic
0bef7ca0cd Bug 965822 - Add null check to HomeListView.setOnItemClickListener. r=lucasr 2014-03-06 09:25:02 -08:00
Wes Kocher
3e0200aabe Merge fxteam to m-c 2014-03-05 18:20:17 -08:00
Ryan VanderMeulen
a82c72c6ca Merge m-c to inbound on a CLOSED TREE. 2014-03-05 16:08:02 -05:00
Ryan VanderMeulen
3d07d638ad Merge b2g-inbound to m-c. 2014-03-05 16:01:53 -05:00
Margaret Leibovic
cc33aee3ea backout 4bc6027f5638 for causing bug 978741 2014-03-05 12:21:22 -08:00
Margaret Leibovic
a7779868e8 backout 9ee8634f70dc because it didn't work 2014-03-05 12:21:20 -08:00
Nick Alexander
c50facf8d3 Bug 978587 - Make GeckoView package org.mozilla.gecko; don't include org.mozilla.gecko.R. r=blassey
This builds a new Java JAR containing only org.mozilla.gecko.R.  This
new JAR file is included in Fennec, but not included in
geckoview_library.  (Usually ant, gradle, or Eclipse arranges to produce
org.mozilla.gecko.R but not include it in the classes.jar output as part
of a library project.  This mimics that.)

Changing the GeckoView package to org.mozilla.gecko declares to
consuming applications that they should produce org.mozilla.gecko.R,
replacing what was removed above (but with correct resource IDs).
2014-03-05 08:57:09 -08:00
Nick Alexander
9bb1446916 Bug 978587 - Pre: Make geckoview_library and BackgroundInstrumentationTests target android-16. r=blassey
This agrees with Fennec (and BrowserInstrumentationTests).
2014-03-05 08:57:09 -08:00
Jim Chen
d0283f4f04 Bug 975436 - Catch ClassCastException in ANRReporter. r=blassey 2014-03-05 09:05:21 -05:00
Christopher Su
fffcc84d5a Bug 943629 - Remove unnecessary comment in Tabs. r=mcomella 2014-03-05 09:05:07 -05:00
Carsten "Tomcat" Book
4124791bb3 merge mozilla-inbound to mozilla-central 2014-03-05 13:04:39 +01:00
Jed Davis
6a4c4691a0 Bug 946407 - Reimplement DumpMemoryInfoToTempDir in terms of GetReports. r=njn
This winds up exposing things in the nsIMemoryReporterManager interface
that arguably don't belong at that level of abstraction -- "minimize
memory usage first" and DMD -- in order to take advantage of the
infrastructure that GetReports already has for managing the child
processes.
2014-03-04 18:27:13 -08:00
Matt Brubeck
95576befed Bug 972844 - Add a Maybe Later link on about:feedback intro [r=mfinkle] 2014-03-04 16:58:33 -08:00
Richard Newman
d588cdd055 Bug 966143 - Don't attempt to process a malformed password record. r=nalexander 2014-03-04 14:38:11 -08:00
Brian Nicholson
06ecca9062 Bug 976006 - Update bookmark star when page is saved. r=wesj 2014-03-04 13:00:00 -08:00
Brian Nicholson
553b10d067 Bug 962103 - Make progress bar overlap content. r=lucasr 2014-03-04 12:57:23 -08:00
Richard Newman
2aa48a9683 Bug 961238 - Follow-up: eliminate BrowserContract dependency on DBUtils. r=trivial, DONTBUILD 2014-03-04 12:18:26 -08:00
Chenxia Liu
d66e3be430 Bug 942878 - Part 2: Add panel to settings. r=lucasr 2014-03-04 10:31:38 -08:00
Chenxia Liu
8ce8e10415 Bug 942878 - Part 1: Expose public method for adding panels to HomeConfig. r=lucasr 2014-03-04 10:31:38 -08:00
Chenxia Liu
a1299bdfa2 Bug 942878 - Part 0: Add final modifier to GeckoPreferences. r=lucasr 2014-03-04 10:31:37 -08:00
Nick Alexander
63a09ec1f3 Bug 979064 - Declare JUnit 3 instrumentation test applications debuggable. r=rnewman
I also took the opportunity to move a constant into
AndroidManifest.xml.in; it removes a layer of indirection when trying to
determine what Android package gets built.
2014-03-04 09:34:35 -08:00
Lucas Rocha
26d6956e66 Bug 975841 - Bootstrap schema upgrade path in HomeProvide.jsm (r=margaret) 2014-03-04 16:57:43 +00:00
Lucas Rocha
d9f3d4bbac Backed out changeset 70bccf82bbfa (forgot to add reviewer) 2014-03-04 16:54:32 +00:00
Lucas Rocha
d7fa164d02 Bug 975841 - Bootstrap schema upgrade path in HomeProvide.jsm 2014-03-04 16:52:13 +00:00
Wes Johnston
10d98500b6 Bug 967254 - Delay Webapp Uninstall code till delayed startup. r=rnewman 2014-03-04 08:35:39 -08:00
Wes Johnston
9d1664d882 Bug 977592 - Don't autofocus the password field in auth dialogs. r=margaret 2014-03-04 08:31:06 -08:00
Wes Johnston
132e81c4ca Bug 974289 - Fixup test for FilePicker results. r=lucasr 2014-03-04 08:29:26 -08:00
Josh Dover
2ae98fce47 Bug 978741 - Fix tab strip on tablets. r=margaret 2014-03-03 13:23:38 -08:00
Sola Ogunsakin
a52845e046 Bug 959290 - Test for ReadingListProvider. r=mcomella 2014-03-03 14:37:13 -08:00
Sola Ogunsakin
a01edc17fd Bug 959290 - Make ContentProvider for Reading List. r=lucasr 2014-03-03 15:34:57 -08:00
Wes Kocher
ac800b68ed Merge m-c to fx-team 2014-03-03 20:39:02 -08:00
Wes Kocher
931a86b030 Merge inbound to m-c 2014-03-03 20:25:51 -08:00
Brian Nicholson
6580583f25 Bug 979038 - Disable testAboutHomePageNavigation. r=mcomella 2014-03-03 19:43:56 -08:00
Brian Nicholson
03cc1c6ccf Bug 977669 - Rename save subscribe ID. r=mfinkle 2014-03-03 19:41:37 -08:00
Richard Newman
c78053ee78 Bug 707123 - Part 1: refactor GeckoProfileDirectories out of GeckoProfile. r=nalexander 2014-03-03 15:27:42 -08:00
Nick Alexander
8514a9a94f Bug 977358 - Replace status activity header with 'Signed in as'. r=rnewman 2014-03-03 15:20:20 -08:00
Nick Alexander
1d7921eb47 Bug 972051 - Dismiss 'Tap to sign in' notification when a sync succeeds. r=rnewman 2014-03-03 15:20:19 -08:00
Nick Alexander
e676ebd6e4 Bug 977336 - Support action bar 'up' for FxAccountStatusActivity. r=rnewman 2014-03-03 15:20:19 -08:00
Nick Alexander
a63be26f08 Bug 974134 - Improve FxAccountStatusActivity layout. r=rnewman 2014-03-03 15:20:19 -08:00
Brad Lassey
f4a746f0ab Bug 962606 - Suggestions are present for password field, switch to use text transforms to reveal text. r=nalexander 2014-03-03 15:20:18 -08:00
Ryan VanderMeulen
9fceaa515e Backed out changeset 7e424486f60e (bug 950417) for adding new attack surface. 2014-03-03 17:48:12 -05:00
Ryan VanderMeulen
2a78057cf2 Merge m-c to inbound. 2014-03-03 17:23:35 -05:00
Brian Nicholson
74c1ef2cef Bug 978494 - Fix URL in Reader:Removed. r=lucsar 2014-03-03 10:35:23 -08:00
Ed Morley
7b1b28e4bd Backed out changeset 1eebddd614eb (bug 962103) for causing bug 947550
--HG--
extra : rebase_source : 809b725149264001d341469ebae420aa19911af4
2014-03-03 17:01:01 +00:00
Ed Morley
a18c2212b0 Merge mozilla-central and fx-team 2014-03-03 14:53:17 +00:00
Ed Morley
1169e3e5fb Merge latest green inbound changeset and mozilla-central 2014-03-03 14:44:44 +00:00
Lucas Rocha
0d9198820e Bug 971214 - Use setBackgroundDrawable() in BasicColorPicker (r=wesj) 2014-03-03 14:16:58 +00:00
Margaret Leibovic
d501cd043d Bug 977844 - Make sure snippets response is valid JSON before caching it (or trying to use it). r=bnicholson 2014-02-28 17:26:56 -08:00
Margaret Leibovic
799078fbf6 Bug 977155 - (Part 2) Rename HomeBanner setEnabled to setActive. r=bnicholson 2014-02-28 17:26:54 -08:00
Margaret Leibovic
3bbedb11ea Bug 977155 - Don't animate HomeBanner when it's not visible. r=bnicholson 2014-02-28 17:26:51 -08:00
Eugen Sawin
565e9da954 Bug 959108 - Update helper apps page actions URL on location change. r=wesj 2014-02-26 22:38:09 +01:00
Brian Nicholson
1d10b3c1aa Backout ab25dcdc319b (bug 960146) for touch event regressions 2014-02-28 13:26:08 -08:00
Wes Johnston
a6bd544bf1 Bug 973348 - Always send click events to the highlighted element. r=kats 2014-02-28 12:54:55 -08:00
Geoff Brown
603b9488f0 Bug 975155 - Skip robocop testFindInPage on Android 2.3 2014-02-28 14:58:36 -07:00
Geoff Brown
cabc7311ea Bug 975187 - Skip robocop testAboutPage on Android 2.3 2014-02-28 14:58:35 -07:00
Myk Melez
ace355561d Bug 977051 - rename manifestUrl property to manifestURL in more places; r=wesj. 2014-02-28 13:43:13 -08:00
Ryan VanderMeulen
094b07dd90 Bug 977952 - Disable testAboutHomePageNavigation for frequent failures. 2014-03-03 14:34:59 -05:00
Josh Dover
092e204a01 Bug 974723 - Send shown event when banner message is displayed. r=margaret 2014-02-20 12:38:27 -08:00
Eugen Sawin
de1e502d4b Bug 950417 - Add XPI intent filter. r=snorp 2014-03-03 18:47:55 +01:00
Brad Lassey
589e27904b bug 969725 - geckoview_example uses incorrect main.xml layout and AndroidManifest r=nalexander 2014-02-27 12:21:06 -05:00
Bevis Tseng
945c0c13b7 Bug 974820 - Part 1: Add new error type STORAGE_FULL_ERROR. r=vyang 2014-02-20 12:17:47 +08:00
Ehsan Akhgari
bf09c6f469 Bug 976896 - Port STL_FLAGS to moz.build; r=mshal 2014-03-04 19:39:06 -05:00
Geoff Brown
e215b0dd7d Bug 979621 - Disable testNewTab on Android 2.3 2014-03-04 17:02:05 -07:00
Geoff Brown
f2a3a2be8a Bug 979620 - Disable testGetUserMedia on Android 2.3 2014-03-04 17:02:05 -07:00
Geoff Brown
b3e49137e4 Bug 948591 - Disable testClearPrivateData on Android 2.3 2014-03-04 17:02:05 -07:00
Geoff Brown
41fe2d4159 Bug 979615 - Disable testBookmarksPanel on Android 2.3 2014-03-04 17:02:05 -07:00
Geoff Brown
4933eb56e6 Bug 979612 - Disable testPictureLinkContextMenu on Android 2.3 2014-03-04 17:02:04 -07:00
Geoff Brown
39dde5b626 Bug 979603 - Disable testBrowserProvider, testMasterPassword, testSystemPages on Android 2.3 2014-03-04 17:02:04 -07:00
Geoff Brown
2815dd7afa Bug 979600 - Disable testSessionOOMRestore on Android 2.3 2014-03-04 17:02:04 -07:00
Geoff Brown
a42d0d5a85 Bug 979597 - Disable testAboutHomeVisibility on Android 2.3 2014-03-04 17:02:04 -07:00
Geoff Brown
99badfbe5c Bug 979548 - Disable testSearchSuggestions on Android 2.3 2014-03-04 17:02:04 -07:00
Geoff Brown
ff66e08eeb Bug 979552 - Disable some robocop tests on Android 2.3 2014-03-04 17:02:04 -07:00
Ryan VanderMeulen
9ee5be5755 Merge m-c to fx-team. 2014-02-28 10:17:27 -05:00
Carsten "Tomcat" Book
649b31451f merge mozilla-inbound to mozilla-central 2014-02-28 14:31:00 +01:00
Ryan VanderMeulen
2d8bf9246c Merge m-c to fx-team. 2014-02-27 17:35:05 -05:00
Ryan VanderMeulen
62397fa8e2 Merge fx-team to m-c. 2014-02-27 17:31:32 -05:00
Richard Newman
b121c3ca97 Bug 969637 - NullPointerException in org.mozilla.gecko.GeckoConnectivityReceiver.start. r=wesj 2014-02-27 12:32:34 -08:00
Brian Nicholson
00c79e6b37 Bug 962103 - Make progress bar overlap content. r=lucasr 2014-02-27 14:12:11 -08:00
Brad Lassey
31fb4f0e2d bug 977677 - GeckoView can't access some resources it needs r=snorp 2014-02-27 12:19:06 -05:00
Arnaud Bienner
f67a121c74 Bug 977643 - Remove redundant line for 'dom.forms.color' pref (and stale comment) in mobile.js file, so that it'll get the pref from all.js instead. r=dholbert 2014-02-27 17:16:18 +01:00
Kartikaya Gupta
bbc791dbf4 Bug 912238 - Ignore exceptions that are thrown after calling System.exit. r=mfinkle 2014-02-27 08:49:51 -05:00
Josh Dover
76e1626431 Bug 966047 - Hide banner when there are no panels enabled. r=mleibovic 2014-02-24 17:05:52 -08:00
Andrea Marchesini
80210d8dab Bug 965860 - patch 2 - ConsoleAPI written in C++, r=bz 2014-02-27 23:39:00 +00:00
Andrea Marchesini
07f3b7d454 Bug 965860 - patch 1 - Convert ConsoleAPIStorage in a Service, r=msucan, r=khuey
--HG--
rename : dom/base/ConsoleAPIStorage.jsm => dom/base/ConsoleAPIStorage.js
2014-02-27 23:38:54 +00:00
Ryan VanderMeulen
136d9870b7 Merge m-c to inbound. 2014-02-27 17:33:47 -05:00
Jim Chen
bf840cb335 Bug 968409 - Run InputConnection tests on IC thread; r=cpeterson r=mcomella 2014-02-27 16:17:56 -05:00
Jim Chen
3e93b52259 Bug 968409 - Add testInputConnection with basic tests; r=cpeterson r=mcomella 2014-02-27 16:17:56 -05:00
Jim Chen
416c52220a Bug 968409 - Add TextInputHelper for UITests; r=mcomella 2014-02-27 16:17:55 -05:00
Jim Chen
7a32a3698e Bug 968409 - Add GeckoViewComponent for UITests; r=mcomella 2014-02-27 16:17:55 -05:00
Jim Chen
ea1a60fd47 Bug 968409 - Add FrameworkHelper for UITests; r=mcomella 2014-02-27 16:17:55 -05:00
Jim Chen
a4573b3511 Bug 968409 - Add assertNotEquals method; r=mcomella 2014-02-27 16:17:54 -05:00
Wesley Johnston
40bd147dc5 Bug 959742 - Close dialogs when inputs change if there are no buttons on the dialog. r=bnicholson 2014-02-06 16:26:00 -08:00
Wes Johnston
5f19ca1260 Bug 963208 - Use a factory for GeckoEvents. r=kats 2014-02-28 12:25:30 -08:00
Lucas Rocha
52475f37ac Bug 981676 - Backout progress bar refinements from bugs 980438/962103 (r=mfinkle) 2014-03-13 12:57:51 -04:00
Eugen Sawin
c2a316e2f1 Bug 981483 - Clear helper app page actions on page load. r=wesj 2014-03-10 05:26:41 +01:00
Margaret Leibovic
9c272e5f0b backout 1acaa42690a6 for memory regressions 2014-03-13 08:21:38 -07:00
Margaret Leibovic
7a270dcf31 backout 7c458c70cd5c for suspected talos regression 2014-03-13 07:48:57 -07:00
Ryan VanderMeulen
a2a03608f4 Backed out changesets c6ca1aa3887a, d741e117a033, 1fd26e822e73, and 720962c9f993 (bug 961665) for build bustage and xpcshell failures. 2014-03-13 10:32:57 -04:00
Kartikaya Gupta
9de75962ee Bug 981636 - Only disable double-tap-to-zoom if a meta-viewport tag is actually specified. r=mbrubeck 2014-03-13 09:52:50 -04:00
David Rajchenbach-Teller
b1566a0457 Bug 961665 - Native implementation of OS.File.read, native bits. r=froydnj, r=bz, r=paolo 2014-03-13 09:51:22 -04:00
Eugen Sawin
bf21fa8295 Bug 974771 - Ignore open request for unfinished download. r=wesj 2014-03-06 22:19:17 +01:00
Martyn Haigh
e9180388f8 Bug 970208 - Only print debug messages when in debug mode; r=wesj 2014-03-05 08:13:22 -08:00
Martyn Haigh
1890a5332f Bug 970209 - Surround update logic in about:apps with synth apk specific wrapper; r=wesj 2014-03-05 08:13:00 -08:00
Ryan VanderMeulen
760e2a311f Backed out changeset 6f05267b4afc (bug 798033) for Android bustage. 2014-03-05 09:55:52 -05:00
snigdha
ef5d7c4e73 Bug 798033 - Headers should generally not do "using namespace" at file scope. r=jib, r=jmathies, r=rjesup, r=ekr, r=ncameron, r=blassey 2014-03-05 08:47:45 -05:00
Chris Pearce
f15c1aea78 Bug 973408 - Move MediaDecoderStateMachine::DecodeLoop()'s local variables to class members so the function can be made reentrant in future. r=kinetik 2014-03-11 11:44:08 +08:00
Wes Kocher
e41db1a003 Merge inbound to m-c 2014-02-26 18:20:47 -08:00
Ryan VanderMeulen
74e250820f Backed out the rest of bug 959742. 2014-02-26 15:32:10 -05:00
Ehsan Akhgari
24fd302ac5 Bug 959768 - Add non-unified mozconfigs for Android builds; r=catlee 2014-02-26 15:06:41 -05:00
Wes Johnston
07b47fc3c3 backout b0fd368ba5ec (Bug 959742) for build bustage 2014-02-26 11:32:33 -08:00
Carsten "Tomcat" Book
bf2c766ca6 merge mozilla-inbound to mozilla-central 2014-02-26 12:47:07 +01:00
Wes Kocher
5f8757f088 Merge m-c to fx-team 2014-02-25 20:38:33 -08:00