Merge mozilla-central to mozilla-inbound
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Mon, 07 Dec 2015 14:50:40 +0100
changeset 309982 1009be1b37ec484d73361487a11ec7cf05d5fb35
parent 309981 cb1a697de90dd77aa7e0a9d3e94fedd4a39d6f96 (current diff)
parent 309978 59bc3c7a83de7ffb611203912a7da6ad84535a5a (diff)
child 309983 627b01cda561566049d1497f47c8d789948496aa
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone45.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 mozilla-central to mozilla-inbound
mobile/android/base/ANRReporter.java
mobile/android/base/AboutPages.java
mobile/android/base/AccountsHelper.java
mobile/android/base/ActionModeCompat.java
mobile/android/base/ActionModeCompatView.java
mobile/android/base/ActivityHandlerHelper.java
mobile/android/base/AlarmReceiver.java
mobile/android/base/AndroidGamepadManager.java
mobile/android/base/AppNotificationClient.java
mobile/android/base/Assert.java
mobile/android/base/BaseGeckoInterface.java
mobile/android/base/BrowserApp.java
mobile/android/base/BrowserLocaleManager.java
mobile/android/base/ChromeCast.java
mobile/android/base/ContactService.java
mobile/android/base/ContextGetter.java
mobile/android/base/CrashHandler.java
mobile/android/base/CrashReporter.java
mobile/android/base/CustomEditText.java
mobile/android/base/DataReportingNotification.java
mobile/android/base/DevToolsAuthHelper.java
mobile/android/base/DoorHangerPopup.java
mobile/android/base/DownloadsIntegration.java
mobile/android/base/DynamicToolbar.java
mobile/android/base/EditBookmarkDialog.java
mobile/android/base/EventDispatcher.java
mobile/android/base/FilePicker.java
mobile/android/base/FilePickerResultHandler.java
mobile/android/base/FindInPageBar.java
mobile/android/base/FormAssistPopup.java
mobile/android/base/GeckoAccessibility.java
mobile/android/base/GeckoActivity.java
mobile/android/base/GeckoActivityStatus.java
mobile/android/base/GeckoApp.java
mobile/android/base/GeckoAppShell.java
mobile/android/base/GeckoApplication.java
mobile/android/base/GeckoBatteryManager.java
mobile/android/base/GeckoConnectivityReceiver.java
mobile/android/base/GeckoEditable.java
mobile/android/base/GeckoEditableClient.java
mobile/android/base/GeckoEditableListener.java
mobile/android/base/GeckoEvent.java
mobile/android/base/GeckoHalDefines.java
mobile/android/base/GeckoInputConnection.java
mobile/android/base/GeckoJavaSampler.java
mobile/android/base/GeckoMediaPlayer.java
mobile/android/base/GeckoMessageReceiver.java
mobile/android/base/GeckoNetworkManager.java
mobile/android/base/GeckoProfile.java
mobile/android/base/GeckoProfileDirectories.java
mobile/android/base/GeckoProfilesProvider.java
mobile/android/base/GeckoScreenOrientation.java
mobile/android/base/GeckoService.java
mobile/android/base/GeckoSharedPrefs.java
mobile/android/base/GeckoSmsManager.java
mobile/android/base/GeckoThread.java
mobile/android/base/GeckoUpdateReceiver.java
mobile/android/base/GeckoView.java
mobile/android/base/GeckoViewChrome.java
mobile/android/base/GeckoViewContent.java
mobile/android/base/GlobalHistory.java
mobile/android/base/GuestSession.java
mobile/android/base/InputConnectionListener.java
mobile/android/base/InputMethods.java
mobile/android/base/IntentHelper.java
mobile/android/base/LocaleManager.java
mobile/android/base/Locales.java
mobile/android/base/MediaCastingBar.java
mobile/android/base/MediaPlayerManager.java
mobile/android/base/MemoryMonitor.java
mobile/android/base/MotionEventInterceptor.java
mobile/android/base/NSSBridge.java
mobile/android/base/NotificationClient.java
mobile/android/base/NotificationHandler.java
mobile/android/base/NotificationHelper.java
mobile/android/base/NotificationService.java
mobile/android/base/OrderedBroadcastHelper.java
mobile/android/base/PrefsHelper.java
mobile/android/base/PresentationMediaPlayerManager.java
mobile/android/base/PrintHelper.java
mobile/android/base/PrivateTab.java
mobile/android/base/ReaderModeUtils.java
mobile/android/base/ReadingListHelper.java
mobile/android/base/RemoteClientsDialogFragment.java
mobile/android/base/RemoteTabsExpandableListAdapter.java
mobile/android/base/Restarter.java
mobile/android/base/Restrictions.java
mobile/android/base/ServiceNotificationClient.java
mobile/android/base/SessionParser.java
mobile/android/base/SharedPreferencesHelper.java
mobile/android/base/SiteIdentity.java
mobile/android/base/SmsManager.java
mobile/android/base/SuggestClient.java
mobile/android/base/SurfaceBits.java
mobile/android/base/SysInfo.java
mobile/android/base/Tab.java
mobile/android/base/Tabs.java
mobile/android/base/Telemetry.java
mobile/android/base/TelemetryContract.java
mobile/android/base/TextSelection.java
mobile/android/base/TextSelectionHandle.java
mobile/android/base/ThumbnailHelper.java
mobile/android/base/TouchEventInterceptor.java
mobile/android/base/Webapp.java
mobile/android/base/ZoomConstraints.java
mobile/android/base/ZoomedView.java
mobile/android/base/adjust/AdjustHelper.java
mobile/android/base/adjust/AdjustHelperInterface.java
mobile/android/base/adjust/StubAdjustHelper.java
mobile/android/base/animation/AnimationUtils.java
mobile/android/base/animation/AnimatorProxy.java
mobile/android/base/animation/BounceAnimatorBuilder.java
mobile/android/base/animation/HeightChangeAnimation.java
mobile/android/base/animation/PropertyAnimator.java
mobile/android/base/animation/Rotate3DAnimation.java
mobile/android/base/animation/TransitionsTracker.java
mobile/android/base/animation/ViewHelper.java
mobile/android/base/annotation/JNITarget.java
mobile/android/base/annotation/ReflectionTarget.java
mobile/android/base/annotation/RobocopTarget.java
mobile/android/base/annotation/WebRTCJNITarget.java
mobile/android/base/annotation/WrapForJNI.java
mobile/android/base/db/AbstractPerProfileDatabaseProvider.java
mobile/android/base/db/AbstractTransactionalProvider.java
mobile/android/base/db/BaseTable.java
mobile/android/base/db/BrowserContract.java
mobile/android/base/db/BrowserDB.java
mobile/android/base/db/BrowserDatabaseHelper.java
mobile/android/base/db/BrowserProvider.java
mobile/android/base/db/DBUtils.java
mobile/android/base/db/FormHistoryProvider.java
mobile/android/base/db/HomeProvider.java
mobile/android/base/db/LocalBrowserDB.java
mobile/android/base/db/LocalReadingListAccessor.java
mobile/android/base/db/LocalSearches.java
mobile/android/base/db/LocalTabsAccessor.java
mobile/android/base/db/LocalURLMetadata.java
mobile/android/base/db/PasswordsProvider.java
mobile/android/base/db/PerProfileDatabaseProvider.java
mobile/android/base/db/PerProfileDatabases.java
mobile/android/base/db/ReadingListAccessor.java
mobile/android/base/db/ReadingListProvider.java
mobile/android/base/db/RemoteClient.java
mobile/android/base/db/RemoteTab.java
mobile/android/base/db/SQLiteBridgeContentProvider.java
mobile/android/base/db/SearchHistoryProvider.java
mobile/android/base/db/Searches.java
mobile/android/base/db/SharedBrowserDatabaseProvider.java
mobile/android/base/db/StubBrowserDB.java
mobile/android/base/db/SuggestedSites.java
mobile/android/base/db/Table.java
mobile/android/base/db/TabsAccessor.java
mobile/android/base/db/TabsProvider.java
mobile/android/base/db/TopSitesCursorWrapper.java
mobile/android/base/db/URLMetadata.java
mobile/android/base/db/URLMetadataTable.java
mobile/android/base/distribution/Distribution.java
mobile/android/base/distribution/ReferrerDescriptor.java
mobile/android/base/distribution/ReferrerReceiver.java
mobile/android/base/dlc/DownloadContentHelper.java
mobile/android/base/dlc/DownloadContentService.java
mobile/android/base/dlc/catalog/DownloadContent.java
mobile/android/base/dlc/catalog/DownloadContentBootstrap.java
mobile/android/base/dlc/catalog/DownloadContentCatalog.java
mobile/android/base/favicons/Favicons.java
mobile/android/base/favicons/LoadFaviconTask.java
mobile/android/base/favicons/OnFaviconLoadedListener.java
mobile/android/base/favicons/RemoteFavicon.java
mobile/android/base/favicons/cache/FaviconCache.java
mobile/android/base/favicons/cache/FaviconCacheElement.java
mobile/android/base/favicons/cache/FaviconsForURL.java
mobile/android/base/favicons/decoders/FaviconDecoder.java
mobile/android/base/favicons/decoders/ICODecoder.java
mobile/android/base/favicons/decoders/IconDirectoryEntry.java
mobile/android/base/favicons/decoders/LoadFaviconResult.java
mobile/android/base/firstrun/FirstrunPager.java
mobile/android/base/firstrun/FirstrunPagerConfig.java
mobile/android/base/firstrun/FirstrunPane.java
mobile/android/base/firstrun/FirstrunPanel.java
mobile/android/base/firstrun/ImportPanel.java
mobile/android/base/firstrun/RestrictedWelcomePanel.java
mobile/android/base/firstrun/SyncPanel.java
mobile/android/base/firstrun/WelcomePanel.java
mobile/android/base/gfx/Axis.java
mobile/android/base/gfx/BitmapUtils.java
mobile/android/base/gfx/BufferedImage.java
mobile/android/base/gfx/BufferedImageGLInfo.java
mobile/android/base/gfx/DisplayPortCalculator.java
mobile/android/base/gfx/DisplayPortMetrics.java
mobile/android/base/gfx/DrawTimingQueue.java
mobile/android/base/gfx/DynamicToolbarAnimator.java
mobile/android/base/gfx/FloatSize.java
mobile/android/base/gfx/FullScreenState.java
mobile/android/base/gfx/GLController.java
mobile/android/base/gfx/GeckoLayerClient.java
mobile/android/base/gfx/ImmutableViewportMetrics.java
mobile/android/base/gfx/IntSize.java
mobile/android/base/gfx/JavaPanZoomController.java
mobile/android/base/gfx/Layer.java
mobile/android/base/gfx/LayerRenderer.java
mobile/android/base/gfx/LayerView.java
mobile/android/base/gfx/NativePanZoomController.java
mobile/android/base/gfx/Overscroll.java
mobile/android/base/gfx/OverscrollEdgeEffect.java
mobile/android/base/gfx/PanZoomController.java
mobile/android/base/gfx/PanZoomTarget.java
mobile/android/base/gfx/PanningPerfAPI.java
mobile/android/base/gfx/PluginLayer.java
mobile/android/base/gfx/PointUtils.java
mobile/android/base/gfx/ProgressiveUpdateData.java
mobile/android/base/gfx/RectUtils.java
mobile/android/base/gfx/RenderTask.java
mobile/android/base/gfx/ScrollbarLayer.java
mobile/android/base/gfx/SimpleScaleGestureDetector.java
mobile/android/base/gfx/SubdocumentScrollHelper.java
mobile/android/base/gfx/TextureGenerator.java
mobile/android/base/gfx/TextureReaper.java
mobile/android/base/gfx/TouchEventHandler.java
mobile/android/base/gfx/ViewTransform.java
mobile/android/base/gfx/VirtualLayer.java
mobile/android/base/health/BrowserHealthRecorder.java
mobile/android/base/health/BrowserHealthReporter.java
mobile/android/base/health/HealthRecorder.java
mobile/android/base/health/SessionInformation.java
mobile/android/base/health/StubbedHealthRecorder.java
mobile/android/base/home/BookmarkFolderView.java
mobile/android/base/home/BookmarksListAdapter.java
mobile/android/base/home/BookmarksListView.java
mobile/android/base/home/BookmarksPanel.java
mobile/android/base/home/BrowserSearch.java
mobile/android/base/home/DynamicPanel.java
mobile/android/base/home/FramePanelLayout.java
mobile/android/base/home/HistoryHeaderListCursorAdapter.java
mobile/android/base/home/HistoryItemAdapter.java
mobile/android/base/home/HistoryPanel.java
mobile/android/base/home/HomeAdapter.java
mobile/android/base/home/HomeBanner.java
mobile/android/base/home/HomeConfig.java
mobile/android/base/home/HomeConfigLoader.java
mobile/android/base/home/HomeConfigPrefsBackend.java
mobile/android/base/home/HomeContextMenuInfo.java
mobile/android/base/home/HomeExpandableListView.java
mobile/android/base/home/HomeFragment.java
mobile/android/base/home/HomeListView.java
mobile/android/base/home/HomePager.java
mobile/android/base/home/HomePanelsManager.java
mobile/android/base/home/ImageLoader.java
mobile/android/base/home/MultiTypeCursorAdapter.java
mobile/android/base/home/PanelAuthCache.java
mobile/android/base/home/PanelAuthLayout.java
mobile/android/base/home/PanelBackItemView.java
mobile/android/base/home/PanelHeaderView.java
mobile/android/base/home/PanelInfoManager.java
mobile/android/base/home/PanelItemView.java
mobile/android/base/home/PanelLayout.java
mobile/android/base/home/PanelListView.java
mobile/android/base/home/PanelRecyclerView.java
mobile/android/base/home/PanelRecyclerViewAdapter.java
mobile/android/base/home/PanelRefreshLayout.java
mobile/android/base/home/PanelViewAdapter.java
mobile/android/base/home/PanelViewItemHandler.java
mobile/android/base/home/PinSiteDialog.java
mobile/android/base/home/ReadingListPanel.java
mobile/android/base/home/ReadingListRow.java
mobile/android/base/home/RecentTabsPanel.java
mobile/android/base/home/RemoteTabsBaseFragment.java
mobile/android/base/home/RemoteTabsExpandableListFragment.java
mobile/android/base/home/RemoteTabsExpandableListState.java
mobile/android/base/home/RemoteTabsPanel.java
mobile/android/base/home/RemoteTabsSplitPlaneFragment.java
mobile/android/base/home/RemoteTabsStaticFragment.java
mobile/android/base/home/SearchEngine.java
mobile/android/base/home/SearchEngineAdapter.java
mobile/android/base/home/SearchEngineBar.java
mobile/android/base/home/SearchEngineRow.java
mobile/android/base/home/SearchLoader.java
mobile/android/base/home/SimpleCursorLoader.java
mobile/android/base/home/SpacingDecoration.java
mobile/android/base/home/TabMenuStrip.java
mobile/android/base/home/TabMenuStripLayout.java
mobile/android/base/home/TopSitesGridItemView.java
mobile/android/base/home/TopSitesGridView.java
mobile/android/base/home/TopSitesPanel.java
mobile/android/base/home/TopSitesThumbnailView.java
mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java
mobile/android/base/home/TwoLinePageRow.java
mobile/android/base/javaaddons/JavaAddonManager.java
mobile/android/base/javaaddons/JavaAddonManagerV1.java
mobile/android/base/lwt/LightweightTheme.java
mobile/android/base/lwt/LightweightThemeDrawable.java
mobile/android/base/mdns/MulticastDNSManager.java
mobile/android/base/menu/GeckoMenu.java
mobile/android/base/menu/GeckoMenuInflater.java
mobile/android/base/menu/GeckoMenuItem.java
mobile/android/base/menu/GeckoSubMenu.java
mobile/android/base/menu/MenuItemActionBar.java
mobile/android/base/menu/MenuItemDefault.java
mobile/android/base/menu/MenuItemSwitcherLayout.java
mobile/android/base/menu/MenuPanel.java
mobile/android/base/menu/MenuPopup.java
mobile/android/base/menu/QuickShareBarActionView.java
mobile/android/base/mozglue/ByteBufferInputStream.java
mobile/android/base/mozglue/ContextUtils.java
mobile/android/base/mozglue/DirectBufferAllocator.java
mobile/android/base/mozglue/GeckoLoader.java
mobile/android/base/mozglue/JNIObject.java
mobile/android/base/mozglue/NativeReference.java
mobile/android/base/mozglue/NativeZip.java
mobile/android/base/overlays/OverlayConstants.java
mobile/android/base/overlays/service/OverlayActionService.java
mobile/android/base/overlays/service/ShareData.java
mobile/android/base/overlays/service/sharemethods/AddBookmark.java
mobile/android/base/overlays/service/sharemethods/AddToReadingList.java
mobile/android/base/overlays/service/sharemethods/SendTab.java
mobile/android/base/overlays/service/sharemethods/ShareMethod.java
mobile/android/base/overlays/ui/OverlayDialogButton.java
mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java
mobile/android/base/overlays/ui/SendTabList.java
mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java
mobile/android/base/overlays/ui/ShareDialog.java
mobile/android/base/preferences/AlignRightLinkPreference.java
mobile/android/base/preferences/AndroidImport.java
mobile/android/base/preferences/AndroidImportPreference.java
mobile/android/base/preferences/ClearOnShutdownPref.java
mobile/android/base/preferences/CustomCheckBoxPreference.java
mobile/android/base/preferences/CustomListCategory.java
mobile/android/base/preferences/CustomListPreference.java
mobile/android/base/preferences/DistroSharedPrefsImport.java
mobile/android/base/preferences/FontSizePreference.java
mobile/android/base/preferences/GeckoPreferenceFragment.java
mobile/android/base/preferences/GeckoPreferences.java
mobile/android/base/preferences/LinkPreference.java
mobile/android/base/preferences/ListCheckboxPreference.java
mobile/android/base/preferences/LocaleListPreference.java
mobile/android/base/preferences/ModifiableHintPreference.java
mobile/android/base/preferences/MultiChoicePreference.java
mobile/android/base/preferences/MultiPrefMultiChoicePreference.java
mobile/android/base/preferences/PanelsPreference.java
mobile/android/base/preferences/PanelsPreferenceCategory.java
mobile/android/base/preferences/PrivateDataPreference.java
mobile/android/base/preferences/SearchEnginePreference.java
mobile/android/base/preferences/SearchPreferenceCategory.java
mobile/android/base/preferences/SetHomepagePreference.java
mobile/android/base/preferences/SyncPreference.java
mobile/android/base/prompts/ColorPickerInput.java
mobile/android/base/prompts/IconGridInput.java
mobile/android/base/prompts/IntentChooserPrompt.java
mobile/android/base/prompts/IntentHandler.java
mobile/android/base/prompts/Prompt.java
mobile/android/base/prompts/PromptInput.java
mobile/android/base/prompts/PromptListAdapter.java
mobile/android/base/prompts/PromptListItem.java
mobile/android/base/prompts/PromptService.java
mobile/android/base/prompts/TabInput.java
mobile/android/base/restrictions/DefaultConfiguration.java
mobile/android/base/restrictions/GuestProfileConfiguration.java
mobile/android/base/restrictions/Restrictable.java
mobile/android/base/restrictions/RestrictedProfileConfiguration.java
mobile/android/base/restrictions/RestrictionConfiguration.java
mobile/android/base/restrictions/RestrictionProvider.java
mobile/android/base/sqlite/ByteBufferInputStream.java
mobile/android/base/sqlite/MatrixBlobCursor.java
mobile/android/base/sqlite/SQLiteBridge.java
mobile/android/base/sqlite/SQLiteBridgeException.java
mobile/android/base/tabqueue/TabQueueDispatcher.java
mobile/android/base/tabqueue/TabQueueHelper.java
mobile/android/base/tabqueue/TabQueuePrompt.java
mobile/android/base/tabqueue/TabQueueService.java
mobile/android/base/tabqueue/TabReceivedService.java
mobile/android/base/tabs/PrivateTabsPanel.java
mobile/android/base/tabs/TabCurve.java
mobile/android/base/tabs/TabHistoryController.java
mobile/android/base/tabs/TabHistoryFragment.java
mobile/android/base/tabs/TabHistoryItemRow.java
mobile/android/base/tabs/TabHistoryPage.java
mobile/android/base/tabs/TabPanelBackButton.java
mobile/android/base/tabs/TabStrip.java
mobile/android/base/tabs/TabStripAdapter.java
mobile/android/base/tabs/TabStripItemView.java
mobile/android/base/tabs/TabStripView.java
mobile/android/base/tabs/TabsGridLayout.java
mobile/android/base/tabs/TabsLayoutAdapter.java
mobile/android/base/tabs/TabsLayoutItemView.java
mobile/android/base/tabs/TabsListLayout.java
mobile/android/base/tabs/TabsPanel.java
mobile/android/base/tabs/TabsPanelThumbnailView.java
mobile/android/base/tiles/Tile.java
mobile/android/base/tiles/TilesRecorder.java
mobile/android/base/toolbar/AutocompleteHandler.java
mobile/android/base/toolbar/BackButton.java
mobile/android/base/toolbar/BrowserToolbar.java
mobile/android/base/toolbar/BrowserToolbarPhone.java
mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
mobile/android/base/toolbar/BrowserToolbarPreHC.java
mobile/android/base/toolbar/BrowserToolbarTablet.java
mobile/android/base/toolbar/BrowserToolbarTabletBase.java
mobile/android/base/toolbar/CanvasDelegate.java
mobile/android/base/toolbar/ForwardButton.java
mobile/android/base/toolbar/NavButton.java
mobile/android/base/toolbar/PageActionLayout.java
mobile/android/base/toolbar/PhoneTabsButton.java
mobile/android/base/toolbar/ShapedButton.java
mobile/android/base/toolbar/ShapedButtonFrameLayout.java
mobile/android/base/toolbar/SiteIdentityPopup.java
mobile/android/base/toolbar/TabCounter.java
mobile/android/base/toolbar/ToolbarDisplayLayout.java
mobile/android/base/toolbar/ToolbarEditLayout.java
mobile/android/base/toolbar/ToolbarEditText.java
mobile/android/base/toolbar/ToolbarPrefs.java
mobile/android/base/toolbar/ToolbarProgressView.java
mobile/android/base/trackingprotection/TrackingProtectionPrompt.java
mobile/android/base/updater/UpdateService.java
mobile/android/base/updater/UpdateServiceHelper.java
mobile/android/base/util/ActivityResultHandler.java
mobile/android/base/util/ActivityResultHandlerMap.java
mobile/android/base/util/ActivityUtils.java
mobile/android/base/util/BundleEventListener.java
mobile/android/base/util/Clipboard.java
mobile/android/base/util/ColorUtils.java
mobile/android/base/util/DrawableUtil.java
mobile/android/base/util/EventCallback.java
mobile/android/base/util/FileUtils.java
mobile/android/base/util/FloatUtils.java
mobile/android/base/util/GamepadUtils.java
mobile/android/base/util/GeckoBackgroundThread.java
mobile/android/base/util/GeckoEventListener.java
mobile/android/base/util/GeckoJarReader.java
mobile/android/base/util/GeckoRequest.java
mobile/android/base/util/HardwareCodecCapabilityUtils.java
mobile/android/base/util/HardwareUtils.java
mobile/android/base/util/INIParser.java
mobile/android/base/util/INISection.java
mobile/android/base/util/IOUtils.java
mobile/android/base/util/InputOptionsUtils.java
mobile/android/base/util/JSONUtils.java
mobile/android/base/util/MenuUtils.java
mobile/android/base/util/NativeEventListener.java
mobile/android/base/util/NativeJSContainer.java
mobile/android/base/util/NativeJSObject.java
mobile/android/base/util/NonEvictingLruCache.java
mobile/android/base/util/PrefUtils.java
mobile/android/base/util/ProxySelector.java
mobile/android/base/util/RawResource.java
mobile/android/base/util/StringUtils.java
mobile/android/base/util/ThreadUtils.java
mobile/android/base/util/UIAsyncTask.java
mobile/android/base/util/UnusedResourcesUtil.java
mobile/android/base/util/WeakReferenceHandler.java
mobile/android/base/util/WebActivityMapper.java
mobile/android/base/util/WindowUtils.java
mobile/android/base/webapp/Allocator.java
mobile/android/base/webapp/ApkResources.java
mobile/android/base/webapp/Dispatcher.java
mobile/android/base/webapp/EventListener.java
mobile/android/base/webapp/InstallHelper.java
mobile/android/base/webapp/InstallListener.java
mobile/android/base/webapp/TaskKiller.java
mobile/android/base/webapp/UninstallListener.java
mobile/android/base/webapp/WebappImpl.java
mobile/android/base/webapp/Webapps.java
mobile/android/base/widget/ActivityChooserModel.java
mobile/android/base/widget/AllCapsTextView.java
mobile/android/base/widget/AnchoredPopup.java
mobile/android/base/widget/AnimatedHeightLayout.java
mobile/android/base/widget/BasicColorPicker.java
mobile/android/base/widget/ButtonToast.java
mobile/android/base/widget/CheckableLinearLayout.java
mobile/android/base/widget/ClickableWhenDisabledEditText.java
mobile/android/base/widget/ContentSecurityDoorHanger.java
mobile/android/base/widget/CropImageView.java
mobile/android/base/widget/DateTimePicker.java
mobile/android/base/widget/DefaultDoorHanger.java
mobile/android/base/widget/Divider.java
mobile/android/base/widget/DoorHanger.java
mobile/android/base/widget/DoorhangerConfig.java
mobile/android/base/widget/EllipsisTextView.java
mobile/android/base/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java
mobile/android/base/widget/FadedMultiColorTextView.java
mobile/android/base/widget/FadedSingleColorTextView.java
mobile/android/base/widget/FadedTextView.java
mobile/android/base/widget/FaviconView.java
mobile/android/base/widget/FloatingHintEditText.java
mobile/android/base/widget/FlowLayout.java
mobile/android/base/widget/GeckoActionProvider.java
mobile/android/base/widget/GeckoPopupMenu.java
mobile/android/base/widget/GeckoViewFlipper.java
mobile/android/base/widget/IconTabWidget.java
mobile/android/base/widget/LoginDoorHanger.java
mobile/android/base/widget/RecyclerViewClickSupport.java
mobile/android/base/widget/ResizablePathDrawable.java
mobile/android/base/widget/RoundedCornerLayout.java
mobile/android/base/widget/SiteLogins.java
mobile/android/base/widget/SquaredImageView.java
mobile/android/base/widget/SquaredRelativeLayout.java
mobile/android/base/widget/SwipeDismissListViewTouchListener.java
mobile/android/base/widget/TabThumbnailWrapper.java
mobile/android/base/widget/ThumbnailView.java
mobile/android/base/widget/TwoWayView.java
mobile/android/base/widget/themed/ThemedEditText.java
mobile/android/base/widget/themed/ThemedFrameLayout.java
mobile/android/base/widget/themed/ThemedImageButton.java
mobile/android/base/widget/themed/ThemedImageView.java
mobile/android/base/widget/themed/ThemedLinearLayout.java
mobile/android/base/widget/themed/ThemedRelativeLayout.java
mobile/android/base/widget/themed/ThemedTextSwitcher.java
mobile/android/base/widget/themed/ThemedTextView.java
mobile/android/base/widget/themed/ThemedView.java
mobile/android/base/widget/themed/ThemedView.java.frag
mobile/android/base/widget/themed/generate_themed_views.py
mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/fxa/test/TestFxAccountAgeLockoutHelper.java
--- a/b2g/config/aries/sources.xml
+++ b/b2g/config/aries/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
--- a/b2g/config/dolphin/sources.xml
+++ b/b2g/config/dolphin/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was git://github.com/mozilla/-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gecko and Gaia -->
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <!-- Gonk-specific things and forks -->
   <project name="platform_bionic" path="bionic" remote="b2g" revision="e2b3733ba3fa5e3f404e983d2e4142b1f6b1b846"/>
   <project name="platform_build" path="build" remote="b2g" revision="1b0db93fb6b870b03467aff50d6419771ba0d88c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
   <project name="android-development" path="development" remote="b2g" revision="2bdf22305b523af644e1891b4ddfd9229336d0ce"/>
   <project name="platform_external_apriori" path="external/apriori" remote="b2g" revision="11816ad0406744f963537b23d68ed9c2afb412bd"/>
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="660169a3d7e034a892359e39135e8c2785a6ad6f">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="2d70fdfc0244a7217df1cfa7df9f4798cbfa3af6"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="2d70fdfc0244a7217df1cfa7df9f4798cbfa3af6"/>
--- a/b2g/config/emulator-l/sources.xml
+++ b/b2g/config/emulator-l/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="2d70fdfc0244a7217df1cfa7df9f4798cbfa3af6"/>
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was git://github.com/mozilla/-->
   <remote fetch="https://git.mozilla.org/b2g" name="mozilla"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gecko and Gaia -->
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <!-- Gonk-specific things and forks -->
   <project name="platform_bionic" path="bionic" remote="b2g" revision="e2b3733ba3fa5e3f404e983d2e4142b1f6b1b846"/>
   <project name="platform_build" path="build" remote="b2g" revision="1b0db93fb6b870b03467aff50d6419771ba0d88c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
   <project name="android-development" path="development" remote="b2g" revision="2bdf22305b523af644e1891b4ddfd9229336d0ce"/>
   <project name="platform_external_apriori" path="external/apriori" remote="b2g" revision="11816ad0406744f963537b23d68ed9c2afb412bd"/>
--- a/b2g/config/flame-kk/sources.xml
+++ b/b2g/config/flame-kk/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "b930e25e9f2e5ec2106dd31005468575cdf87d50", 
+        "git_revision": "24ed003a53a81f63367e265fa7117cbe7d23d4c8", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "ef09f991c6706eae886785ececae0cc155b9cebd", 
+    "revision": "b757d41f72aac57cfae0fe875605066f4afa14a4", 
     "repo_path": "integration/gaia-central"
 }
--- a/b2g/config/nexus-4-kk/sources.xml
+++ b/b2g/config/nexus-4-kk/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="8d83715f08b7849f16a0dfc88f78d5c3a89c0a54">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -13,17 +13,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="660169a3d7e034a892359e39135e8c2785a6ad6f">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="2d70fdfc0244a7217df1cfa7df9f4798cbfa3af6"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
   <project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
--- a/b2g/config/nexus-5-l/sources.xml
+++ b/b2g/config/nexus-5-l/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="c9d4fe680662ee44a4bdea42ae00366f5df399cf">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="b930e25e9f2e5ec2106dd31005468575cdf87d50"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="24ed003a53a81f63367e265fa7117cbe7d23d4c8"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="fake-qemu-kernel" path="prebuilts/qemu-kernel" remote="b2g" revision="939b377d55a2f081d94029a30a75d05e5a20daf3"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ac7e9ae8a24ab4a3f3da801ca53f95f39a32b89f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="5f931350fbc87c3df9db8b0ceb37734b8b471593"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="48d8c7c950745f1b166b42125e6f0d3293d71636"/>
--- a/browser/extensions/loop/content/shared/js/activeRoomStore.js
+++ b/browser/extensions/loop/content/shared/js/activeRoomStore.js
@@ -164,16 +164,19 @@ loop.store.ActiveRoomStore = (function()
      * @param {sharedActions.RoomFailure} actionData
      */
     roomFailure: function(actionData) {
       function getReason(serverCode) {
         switch (serverCode) {
           case REST_ERRNOS.INVALID_TOKEN:
           case REST_ERRNOS.EXPIRED:
             return FAILURE_DETAILS.EXPIRED_OR_INVALID;
+          case undefined:
+            // XHR errors reach here with errno as undefined
+            return FAILURE_DETAILS.COULD_NOT_CONNECT;
           default:
             return FAILURE_DETAILS.UNKNOWN;
         }
       }
 
       console.error("Error in state `" + this._storeState.roomState + "`:",
         actionData.error);
 
@@ -350,16 +353,17 @@ loop.store.ActiveRoomStore = (function()
       if (actionData.windowType !== "room") {
         // Nothing for us to do here, leave it to other stores.
         return Promise.resolve();
       }
 
       this.setStoreState({
         roomState: ROOM_STATES.GATHER,
         roomToken: actionData.token,
+        roomCryptoKey: actionData.cryptoKey,
         standalone: true
       });
 
       this._registerPostSetupActions();
 
       var dataPromise = this._getRoomDataForStandalone(actionData.cryptoKey);
 
       var userAgentHandlesPromise = this._promiseDetectUserAgentHandles();
--- a/browser/extensions/loop/standalone/content/js/standaloneMozLoop.js
+++ b/browser/extensions/loop/standalone/content/js/standaloneMozLoop.js
@@ -96,16 +96,21 @@ loop.StandaloneMozLoop = (function(mozL1
             console.error("Error requesting call info", err.message);
             callback(err);
           }
         } else {
           failureHandler(callback, request);
         }
       }.bind(this);
 
+      this._xhrReq.onerror = function() {
+        var request = this._xhrReq;
+        failureHandler(callback, request);
+      }.bind(this);
+
       this._xhrReq.send();
     },
 
     /**
      * Internal function to actually perform a post to a room.
      *
      * @param {String} roomToken    The room token.
      * @param {String} sessionToken The sessionToken for the room if known
--- a/browser/extensions/loop/standalone/content/js/standaloneRoomViews.js
+++ b/browser/extensions/loop/standalone/content/js/standaloneRoomViews.js
@@ -158,16 +158,18 @@ loop.standaloneRoomViews = (function(moz
           return mozL10n.get("rooms_media_denied_message");
         case FAILURE_DETAILS.EXPIRED_OR_INVALID:
           return mozL10n.get("rooms_unavailable_notification_message");
         case FAILURE_DETAILS.TOS_FAILURE:
           return mozL10n.get("tos_failure_message",
             { clientShortname: mozL10n.get("clientShortname2") });
         case FAILURE_DETAILS.ICE_FAILED:
           return mozL10n.get("rooms_ice_failure_message");
+        case FAILURE_DETAILS.COULD_NOT_CONNECT:
+          return mozL10n.get("rooms_server_unavailable_message");
         default:
           return mozL10n.get("status_error");
       }
     },
 
     /**
      * This renders a retry button if one is necessary.
      */
@@ -442,25 +444,29 @@ loop.standaloneRoomViews = (function(moz
      * user media access.
      *
      * @param  {Object} nextProps (Unused)
      * @param  {Object} nextState Next state object.
      */
     componentWillUpdate: function(nextProps, nextState) {
       if (this.state.roomState !== ROOM_STATES.READY &&
           nextState.roomState === ROOM_STATES.READY) {
-        var roomName = nextState.roomName ||
-                       this.state.roomName ||
-                       this.state.roomContextUrls[0].description ||
-                       this.state.roomContextUrls[0].location;
-
-        this.setTitle(mozL10n.get("standalone_title_with_room_name", {
-          roomName: roomName,
-          clientShortname: mozL10n.get("clientShortname2")
-        }));
+        var roomName = nextState.roomName;
+        if (!roomName && nextState.roomContextUrls) {
+          roomName = nextState.roomContextUrls[0].description ||
+              nextState.roomContextUrls[0].location;
+        }
+        if (!roomName) {
+          this.setTitle(mozL10n.get("clientShortname2"));
+        } else {
+          this.setTitle(mozL10n.get("standalone_title_with_room_name", {
+            roomName: roomName,
+            clientShortname: mozL10n.get("clientShortname2")
+          }));
+        }
       }
 
       if (this.state.roomState !== ROOM_STATES.MEDIA_WAIT &&
           nextState.roomState === ROOM_STATES.MEDIA_WAIT) {
         this.props.dispatcher.dispatch(new sharedActions.SetupStreamElements({
           publisherConfig: this.getDefaultPublisherConfig({ publishVideo: true })
         }));
       }
--- a/browser/extensions/loop/standalone/content/js/standaloneRoomViews.jsx
+++ b/browser/extensions/loop/standalone/content/js/standaloneRoomViews.jsx
@@ -158,16 +158,18 @@ loop.standaloneRoomViews = (function(moz
           return mozL10n.get("rooms_media_denied_message");
         case FAILURE_DETAILS.EXPIRED_OR_INVALID:
           return mozL10n.get("rooms_unavailable_notification_message");
         case FAILURE_DETAILS.TOS_FAILURE:
           return mozL10n.get("tos_failure_message",
             { clientShortname: mozL10n.get("clientShortname2") });
         case FAILURE_DETAILS.ICE_FAILED:
           return mozL10n.get("rooms_ice_failure_message");
+        case FAILURE_DETAILS.COULD_NOT_CONNECT:
+          return mozL10n.get("rooms_server_unavailable_message");
         default:
           return mozL10n.get("status_error");
       }
     },
 
     /**
      * This renders a retry button if one is necessary.
      */
@@ -442,25 +444,29 @@ loop.standaloneRoomViews = (function(moz
      * user media access.
      *
      * @param  {Object} nextProps (Unused)
      * @param  {Object} nextState Next state object.
      */
     componentWillUpdate: function(nextProps, nextState) {
       if (this.state.roomState !== ROOM_STATES.READY &&
           nextState.roomState === ROOM_STATES.READY) {
-        var roomName = nextState.roomName ||
-                       this.state.roomName ||
-                       this.state.roomContextUrls[0].description ||
-                       this.state.roomContextUrls[0].location;
-
-        this.setTitle(mozL10n.get("standalone_title_with_room_name", {
-          roomName: roomName,
-          clientShortname: mozL10n.get("clientShortname2")
-        }));
+        var roomName = nextState.roomName;
+        if (!roomName && nextState.roomContextUrls) {
+          roomName = nextState.roomContextUrls[0].description ||
+              nextState.roomContextUrls[0].location;
+        }
+        if (!roomName) {
+          this.setTitle(mozL10n.get("clientShortname2"));
+        } else {
+          this.setTitle(mozL10n.get("standalone_title_with_room_name", {
+            roomName: roomName,
+            clientShortname: mozL10n.get("clientShortname2")
+          }));
+        }
       }
 
       if (this.state.roomState !== ROOM_STATES.MEDIA_WAIT &&
           nextState.roomState === ROOM_STATES.MEDIA_WAIT) {
         this.props.dispatcher.dispatch(new sharedActions.SetupStreamElements({
           publisherConfig: this.getDefaultPublisherConfig({ publishVideo: true })
         }));
       }
--- a/browser/extensions/loop/standalone/content/l10n/en-US/loop.properties
+++ b/browser/extensions/loop/standalone/content/l10n/en-US/loop.properties
@@ -59,16 +59,17 @@ rooms_room_join_label=Join the conversat
 rooms_room_joined_own_conversation_label=Enjoy your conversation
 rooms_already_joined=You're already in this conversation.
 rooms_display_name_guest=Guest
 rooms_unavailable_notification_message=Sorry, you cannot join this conversation. The link may be expired or invalid.
 rooms_media_denied_message=We could not get access to your microphone or camera. Please reload the page to try again.
 room_information_failure_not_available=No information about this conversation is available. Please request a new link from the person who sent it to you.
 room_information_failure_unsupported_browser=Your browser cannot access any information about this conversation. Please make sure you're using the latest version.
 rooms_ice_failure_message=Connection failed. Your firewall may be blocking calls.
+rooms_server_unavailable_message=Could not connect to the server.
 
 ## LOCALIZATION_NOTE(rooms_read_while_wait_offer): This string is followed by a
 # tile/offer image and title that are provided by a separate service that has
 # localized content.
 rooms_read_while_wait_offer=Want something to read while you wait?
 
 ## LOCALIZATION_NOTE(standalone_title_with_room_name): {{roomName}} will be replaced
 ## by the name of the conversation and {{clientShortname}} will be
--- a/browser/extensions/loop/test/shared/activeRoomStore_test.js
+++ b/browser/extensions/loop/test/shared/activeRoomStore_test.js
@@ -115,25 +115,37 @@ describe("loop.store.ActiveRoomStore", f
         error: fakeError,
         failedJoinRequest: false
       }));
 
       expect(store._storeState.roomState).eql(ROOM_STATES.FULL);
     });
 
     it("should set the state to `FAILED` on generic error", function() {
+      // errno !== undefined
+      fakeError.errno = 999;
       store.roomFailure(new sharedActions.RoomFailure({
         error: fakeError,
         failedJoinRequest: false
       }));
 
       expect(store._storeState.roomState).eql(ROOM_STATES.FAILED);
       expect(store._storeState.failureReason).eql(FAILURE_DETAILS.UNKNOWN);
     });
 
+    it("should set the state to `COULD_NOT_CONNECT` on undefined errno", function() {
+      store.roomFailure(new sharedActions.RoomFailure({
+        error: fakeError,
+        failedJoinRequest: false
+      }));
+
+      expect(store._storeState.roomState).eql(ROOM_STATES.FAILED);
+      expect(store._storeState.failureReason).eql(FAILURE_DETAILS.COULD_NOT_CONNECT);
+    });
+
     it("should set the failureReason to EXPIRED_OR_INVALID on server error: " +
       "invalid token", function() {
         fakeError.errno = REST_ERRNOS.INVALID_TOKEN;
 
         store.roomFailure(new sharedActions.RoomFailure({
           error: fakeError,
           failedJoinRequest: false
         }));
--- a/browser/extensions/loop/test/standalone/standaloneMozLoop_test.js
+++ b/browser/extensions/loop/test/standalone/standaloneMozLoop_test.js
@@ -102,16 +102,29 @@ describe("loop.StandaloneMozLoop", funct
         expect(/HTTP 401 Unauthorized/.test(result.message)).eql(true);
       });
 
       requests[0].respond(401, { "Content-Type": "application/json" },
                           JSON.stringify(fakeServerErrorDescription));
 
       return promise;
     });
+
+    it("should call the callback on xhr error", function() {
+      var promise = loop.request("Rooms:Get", "fakeToken").then(function(result) {
+        expect(result.isError).eql(true);
+        expect(/HTTP 0/.test(result.message)).eql(true);
+      });
+
+      // Method to mock network failure
+      // https://github.com/sinonjs/sinon/issues/361
+      requests[0].respond(0, {}, "");
+
+      return promise;
+    });
   });
 
   describe("#rooms.join", function() {
     it("should POST to the server", function() {
       loop.request("Rooms:Join", "fakeToken");
 
       expect(requests).to.have.length.of(1);
       expect(requests[0].url).eql(fakeBaseServerUrl + "/rooms/fakeToken");
--- a/browser/extensions/loop/test/standalone/standaloneRoomViews_test.js
+++ b/browser/extensions/loop/test/standalone/standaloneRoomViews_test.js
@@ -341,16 +341,30 @@ describe("loop.standaloneRoomViews", fun
 
     it("should display an tos failure message on TOS_FAILURE", function() {
       view = mountTestComponent({ failureReason: FAILURE_DETAILS.TOS_FAILURE });
 
       expect(view.getDOMNode().querySelector(".failed-room-message").textContent)
         .eql("tos_failure_message");
     });
 
+    it("should display cannot connect to server on COULD_NOT_CONNECT", function() {
+      view = mountTestComponent({ failureReason: FAILURE_DETAILS.COULD_NOT_CONNECT });
+
+      expect(view.getDOMNode().querySelector(".failed-room-message").textContent)
+        .eql("rooms_server_unavailable_message");
+    });
+
+    it("should display Something went wrong on UNKNOWN error", function() {
+      view = mountTestComponent({ failureReason: FAILURE_DETAILS.UNKNOWN });
+
+      expect(view.getDOMNode().querySelector(".failed-room-message").textContent)
+        .eql("status_error");
+    });
+
     it("should not display a retry button when the failure reason is expired or invalid", function() {
       view = mountTestComponent({ failureReason: FAILURE_DETAILS.EXPIRED_OR_INVALID });
 
       expect(view.getDOMNode().querySelector(".btn-info")).eql(null);
     });
 
     it("should not display a retry button when the failure reason is tos failure", function() {
       view = mountTestComponent({ failureReason: FAILURE_DETAILS.TOS_FAILURE });
@@ -438,16 +452,39 @@ describe("loop.standaloneRoomViews", fun
       it("should set document.title to roomName and brand name when the READY state is dispatched", function() {
         activeRoomStore.setStoreState({ roomState: ROOM_STATES.INIT });
         view = mountTestComponent();
         activeRoomStore.setStoreState({ roomState: ROOM_STATES.READY });
 
         expect(fakeWindow.document.title).to.equal("fakeName — clientShortname2");
       });
 
+      it("should set document.title to brand name when state is READY and roomName is undefined", function() {
+        activeRoomStore.setStoreState({ roomState: ROOM_STATES.INIT });
+        view = mountTestComponent();
+        activeRoomStore.setStoreState({ roomName: undefined, roomState: ROOM_STATES.READY });
+
+        expect(fakeWindow.document.title).to.equal("clientShortname2");
+      });
+
+      it("should set document.title to roomContectUrls[0] and brand name when state is READY and roomContextUrls is present", function() {
+        activeRoomStore.setStoreState({ roomState: ROOM_STATES.INIT });
+        view = mountTestComponent();
+        activeRoomStore.setStoreState({
+          roomName: undefined,
+          roomContextUrls: [{
+            description: "fakeStartPage",
+            location: null
+          }],
+          roomState: ROOM_STATES.READY
+        });
+
+        expect(fakeWindow.document.title).to.equal("fakeStartPage — clientShortname2");
+      });
+
       it("should dispatch a `SetupStreamElements` action when the MEDIA_WAIT state " +
         "is entered", function() {
           activeRoomStore.setStoreState({ roomState: ROOM_STATES.READY });
           view = mountTestComponent();
 
           activeRoomStore.setStoreState({ roomState: ROOM_STATES.MEDIA_WAIT });
 
           expectActionDispatched(view);
--- a/build.gradle
+++ b/build.gradle
@@ -96,23 +96,24 @@ idea {
     project {
         languageLevel = '1.7'
     }
 
     module {
         // Object directories take a huge amount of time for IntelliJ to index.
         // Exclude them.  Convention is that object directories start with obj.
         // IntelliJ is clever and will not exclude the parts of the object
-        // directory that are referenced, if there are any.
-        // In practice, indexing the entirety of the tree is taking too long.
+        // directory that are referenced, if there are any.  In practice,
+        // indexing the entirety of the tree is taking too long, so exclude all
+        // but mobile/.
         def topsrcdirURI = file(topsrcdir).toURI()
         excludeDirs += files(file(topsrcdir)
             .listFiles({it.isDirectory()} as FileFilter)
             .collect({topsrcdirURI.relativize(it.toURI()).toString()}) // Relative paths.
-            .findAll({it.startsWith('obj') && !it.startsWith('.') && !it.equals('mobile/')}))
+            .findAll({!it.equals('mobile/')}))
 
         // If topobjdir is below topsrcdir, hide only some portions of that tree.
         def topobjdirURI = file(topobjdir).toURI()
         if (!topsrcdirURI.relativize(topobjdirURI).isAbsolute()) {
             excludeDirs -= file(topobjdir)
             excludeDirs += files(file(topobjdir).listFiles())
             excludeDirs -= file("${topobjdir}/gradle")
         }
--- a/devtools/client/debugger/debugger-controller.js
+++ b/devtools/client/debugger/debugger-controller.js
@@ -234,48 +234,28 @@ var DebuggerController = {
    * @return object
    *         A promise that is resolved when the debugger finishes shutdown.
    */
   shutdownDebugger: Task.async(function*() {
     if (this._shutdown) {
       return;
     }
 
-    yield this._settleAllRequests();
-
     DebuggerView.destroy();
     this.StackFrames.disconnect();
     this.ThreadState.disconnect();
     if (this._target.isTabActor) {
       this.Workers.disconnect();
     }
 
     this.disconnect();
 
     this._shutdown = true;
   }),
 
-  _settleAllRequests: function() {
-    const requests = this.getState().asyncRequests;
-
-    if (requests.length > 0) {
-      const deferred = promise.defer();
-      this.onChange('open-requests', function checkSettled(reqs) {
-        if (reqs.length === 0) {
-          deferred.resolve();
-        }
-
-        this.offChange('open-requests', checkSettled);
-      }.bind(this));
-      return deferred.promise;
-    }
-
-    return promise.resolve();
-  },
-
   /**
    * Initiates remote debugging based on the current target, wiring event
    * handlers as necessary.
    *
    * @return object
    *         A promise that is resolved when the debugger finishes connecting.
    */
   connect: Task.async(function*() {
--- a/mobile/android/app/base/build.gradle
+++ b/mobile/android/app/base/build.gradle
@@ -22,18 +22,17 @@ android {
         abortOnError false
     }
 
     sourceSets {
         main {
             manifest.srcFile "${topsrcdir}/mobile/android/base/AndroidManifest.xml"
 
             java {
-                srcDir "${topobjdir}/gradle/base/src"
-
+                srcDir "${topsrcdir}/mobile/android/base/java"
                 srcDir "${topsrcdir}/mobile/android/search/java"
                 srcDir "${topsrcdir}/mobile/android/javaaddons/java"
                 srcDir "${topsrcdir}/mobile/android/services/src/main/java"
 
                 if (mozconfig.substs.MOZ_ANDROID_MLS_STUMBLER) {
                     srcDir "${topsrcdir}/mobile/android/stumbler/java"
                 }
 
@@ -125,11 +124,10 @@ dependencies {
     testCompile 'org.robolectric:robolectric:3.0'
     testCompile 'org.simpleframework:simple-http:4.1.13'
 }
 
 apply plugin: 'idea'
 
 idea {
     module {
-        excludeDirs += file("${topobjdir}/gradle/base/src/org/mozilla/gecko/resources")
     }
 }
rename from mobile/android/base/ANRReporter.java
rename to mobile/android/base/java/org/mozilla/gecko/ANRReporter.java
rename from mobile/android/base/AboutPages.java
rename to mobile/android/base/java/org/mozilla/gecko/AboutPages.java
rename from mobile/android/base/AccountsHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/AccountsHelper.java
rename from mobile/android/base/ActionModeCompat.java
rename to mobile/android/base/java/org/mozilla/gecko/ActionModeCompat.java
rename from mobile/android/base/ActionModeCompatView.java
rename to mobile/android/base/java/org/mozilla/gecko/ActionModeCompatView.java
rename from mobile/android/base/ActivityHandlerHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/ActivityHandlerHelper.java
rename from mobile/android/base/AlarmReceiver.java
rename to mobile/android/base/java/org/mozilla/gecko/AlarmReceiver.java
rename from mobile/android/base/AndroidGamepadManager.java
rename to mobile/android/base/java/org/mozilla/gecko/AndroidGamepadManager.java
rename from mobile/android/base/AppNotificationClient.java
rename to mobile/android/base/java/org/mozilla/gecko/AppNotificationClient.java
rename from mobile/android/base/Assert.java
rename to mobile/android/base/java/org/mozilla/gecko/Assert.java
rename from mobile/android/base/BaseGeckoInterface.java
rename to mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java
rename from mobile/android/base/BrowserApp.java
rename to mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
rename from mobile/android/base/BrowserLocaleManager.java
rename to mobile/android/base/java/org/mozilla/gecko/BrowserLocaleManager.java
rename from mobile/android/base/ChromeCast.java
rename to mobile/android/base/java/org/mozilla/gecko/ChromeCast.java
rename from mobile/android/base/ContactService.java
rename to mobile/android/base/java/org/mozilla/gecko/ContactService.java
rename from mobile/android/base/ContextGetter.java
rename to mobile/android/base/java/org/mozilla/gecko/ContextGetter.java
rename from mobile/android/base/CrashHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/CrashHandler.java
rename from mobile/android/base/CrashReporter.java
rename to mobile/android/base/java/org/mozilla/gecko/CrashReporter.java
rename from mobile/android/base/CustomEditText.java
rename to mobile/android/base/java/org/mozilla/gecko/CustomEditText.java
rename from mobile/android/base/DataReportingNotification.java
rename to mobile/android/base/java/org/mozilla/gecko/DataReportingNotification.java
rename from mobile/android/base/DevToolsAuthHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/DevToolsAuthHelper.java
rename from mobile/android/base/DoorHangerPopup.java
rename to mobile/android/base/java/org/mozilla/gecko/DoorHangerPopup.java
rename from mobile/android/base/DownloadsIntegration.java
rename to mobile/android/base/java/org/mozilla/gecko/DownloadsIntegration.java
rename from mobile/android/base/DynamicToolbar.java
rename to mobile/android/base/java/org/mozilla/gecko/DynamicToolbar.java
rename from mobile/android/base/EditBookmarkDialog.java
rename to mobile/android/base/java/org/mozilla/gecko/EditBookmarkDialog.java
rename from mobile/android/base/EventDispatcher.java
rename to mobile/android/base/java/org/mozilla/gecko/EventDispatcher.java
rename from mobile/android/base/FilePicker.java
rename to mobile/android/base/java/org/mozilla/gecko/FilePicker.java
rename from mobile/android/base/FilePickerResultHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/FilePickerResultHandler.java
rename from mobile/android/base/FindInPageBar.java
rename to mobile/android/base/java/org/mozilla/gecko/FindInPageBar.java
rename from mobile/android/base/FormAssistPopup.java
rename to mobile/android/base/java/org/mozilla/gecko/FormAssistPopup.java
rename from mobile/android/base/GeckoAccessibility.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoAccessibility.java
rename from mobile/android/base/GeckoActivity.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoActivity.java
rename from mobile/android/base/GeckoActivityStatus.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoActivityStatus.java
rename from mobile/android/base/GeckoApp.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
rename from mobile/android/base/GeckoAppShell.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java
rename from mobile/android/base/GeckoApplication.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoApplication.java
rename from mobile/android/base/GeckoBatteryManager.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoBatteryManager.java
rename from mobile/android/base/GeckoConnectivityReceiver.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoConnectivityReceiver.java
rename from mobile/android/base/GeckoEditable.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoEditable.java
rename from mobile/android/base/GeckoEditableClient.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoEditableClient.java
rename from mobile/android/base/GeckoEditableListener.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoEditableListener.java
rename from mobile/android/base/GeckoEvent.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoEvent.java
rename from mobile/android/base/GeckoHalDefines.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoHalDefines.java
rename from mobile/android/base/GeckoInputConnection.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoInputConnection.java
rename from mobile/android/base/GeckoJavaSampler.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoJavaSampler.java
rename from mobile/android/base/GeckoMediaPlayer.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoMediaPlayer.java
rename from mobile/android/base/GeckoMessageReceiver.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoMessageReceiver.java
rename from mobile/android/base/GeckoNetworkManager.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoNetworkManager.java
rename from mobile/android/base/GeckoProfile.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoProfile.java
rename from mobile/android/base/GeckoProfileDirectories.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoProfileDirectories.java
rename from mobile/android/base/GeckoProfilesProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoProfilesProvider.java
rename from mobile/android/base/GeckoScreenOrientation.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoScreenOrientation.java
rename from mobile/android/base/GeckoService.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoService.java
rename from mobile/android/base/GeckoSharedPrefs.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoSharedPrefs.java
rename from mobile/android/base/GeckoSmsManager.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoSmsManager.java
rename from mobile/android/base/GeckoThread.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoThread.java
rename from mobile/android/base/GeckoUpdateReceiver.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoUpdateReceiver.java
rename from mobile/android/base/GeckoView.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoView.java
rename from mobile/android/base/GeckoViewChrome.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoViewChrome.java
rename from mobile/android/base/GeckoViewContent.java
rename to mobile/android/base/java/org/mozilla/gecko/GeckoViewContent.java
rename from mobile/android/base/GlobalHistory.java
rename to mobile/android/base/java/org/mozilla/gecko/GlobalHistory.java
rename from mobile/android/base/GuestSession.java
rename to mobile/android/base/java/org/mozilla/gecko/GuestSession.java
rename from mobile/android/base/InputConnectionListener.java
rename to mobile/android/base/java/org/mozilla/gecko/InputConnectionListener.java
rename from mobile/android/base/InputMethods.java
rename to mobile/android/base/java/org/mozilla/gecko/InputMethods.java
rename from mobile/android/base/IntentHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
rename from mobile/android/base/LocaleManager.java
rename to mobile/android/base/java/org/mozilla/gecko/LocaleManager.java
rename from mobile/android/base/Locales.java
rename to mobile/android/base/java/org/mozilla/gecko/Locales.java
rename from mobile/android/base/MediaCastingBar.java
rename to mobile/android/base/java/org/mozilla/gecko/MediaCastingBar.java
rename from mobile/android/base/MediaPlayerManager.java
rename to mobile/android/base/java/org/mozilla/gecko/MediaPlayerManager.java
rename from mobile/android/base/MemoryMonitor.java
rename to mobile/android/base/java/org/mozilla/gecko/MemoryMonitor.java
rename from mobile/android/base/MotionEventInterceptor.java
rename to mobile/android/base/java/org/mozilla/gecko/MotionEventInterceptor.java
rename from mobile/android/base/NSSBridge.java
rename to mobile/android/base/java/org/mozilla/gecko/NSSBridge.java
rename from mobile/android/base/NotificationClient.java
rename to mobile/android/base/java/org/mozilla/gecko/NotificationClient.java
rename from mobile/android/base/NotificationHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/NotificationHandler.java
rename from mobile/android/base/NotificationHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/NotificationHelper.java
rename from mobile/android/base/NotificationService.java
rename to mobile/android/base/java/org/mozilla/gecko/NotificationService.java
rename from mobile/android/base/OrderedBroadcastHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/OrderedBroadcastHelper.java
rename from mobile/android/base/PrefsHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/PrefsHelper.java
rename from mobile/android/base/PresentationMediaPlayerManager.java
rename to mobile/android/base/java/org/mozilla/gecko/PresentationMediaPlayerManager.java
rename from mobile/android/base/PrintHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/PrintHelper.java
rename from mobile/android/base/PrivateTab.java
rename to mobile/android/base/java/org/mozilla/gecko/PrivateTab.java
rename from mobile/android/base/ReaderModeUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/ReaderModeUtils.java
rename from mobile/android/base/ReadingListHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/ReadingListHelper.java
rename from mobile/android/base/RemoteClientsDialogFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/RemoteClientsDialogFragment.java
rename from mobile/android/base/RemoteTabsExpandableListAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/RemoteTabsExpandableListAdapter.java
rename from mobile/android/base/Restarter.java
rename to mobile/android/base/java/org/mozilla/gecko/Restarter.java
rename from mobile/android/base/Restrictions.java
rename to mobile/android/base/java/org/mozilla/gecko/Restrictions.java
rename from mobile/android/base/ServiceNotificationClient.java
rename to mobile/android/base/java/org/mozilla/gecko/ServiceNotificationClient.java
rename from mobile/android/base/SessionParser.java
rename to mobile/android/base/java/org/mozilla/gecko/SessionParser.java
rename from mobile/android/base/SharedPreferencesHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/SharedPreferencesHelper.java
rename from mobile/android/base/SiteIdentity.java
rename to mobile/android/base/java/org/mozilla/gecko/SiteIdentity.java
rename from mobile/android/base/SmsManager.java
rename to mobile/android/base/java/org/mozilla/gecko/SmsManager.java
rename from mobile/android/base/SuggestClient.java
rename to mobile/android/base/java/org/mozilla/gecko/SuggestClient.java
rename from mobile/android/base/SurfaceBits.java
rename to mobile/android/base/java/org/mozilla/gecko/SurfaceBits.java
rename from mobile/android/base/SysInfo.java
rename to mobile/android/base/java/org/mozilla/gecko/SysInfo.java
rename from mobile/android/base/Tab.java
rename to mobile/android/base/java/org/mozilla/gecko/Tab.java
rename from mobile/android/base/Tabs.java
rename to mobile/android/base/java/org/mozilla/gecko/Tabs.java
rename from mobile/android/base/Telemetry.java
rename to mobile/android/base/java/org/mozilla/gecko/Telemetry.java
rename from mobile/android/base/TelemetryContract.java
rename to mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
rename from mobile/android/base/TextSelection.java
rename to mobile/android/base/java/org/mozilla/gecko/TextSelection.java
rename from mobile/android/base/TextSelectionHandle.java
rename to mobile/android/base/java/org/mozilla/gecko/TextSelectionHandle.java
rename from mobile/android/base/ThumbnailHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/ThumbnailHelper.java
rename from mobile/android/base/TouchEventInterceptor.java
rename to mobile/android/base/java/org/mozilla/gecko/TouchEventInterceptor.java
rename from mobile/android/base/Webapp.java
rename to mobile/android/base/java/org/mozilla/gecko/Webapp.java
rename from mobile/android/base/ZoomConstraints.java
rename to mobile/android/base/java/org/mozilla/gecko/ZoomConstraints.java
rename from mobile/android/base/ZoomedView.java
rename to mobile/android/base/java/org/mozilla/gecko/ZoomedView.java
rename from mobile/android/base/adjust/AdjustHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelper.java
rename from mobile/android/base/adjust/AdjustHelperInterface.java
rename to mobile/android/base/java/org/mozilla/gecko/adjust/AdjustHelperInterface.java
rename from mobile/android/base/adjust/StubAdjustHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/adjust/StubAdjustHelper.java
rename from mobile/android/base/animation/AnimationUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/AnimationUtils.java
rename from mobile/android/base/animation/AnimatorProxy.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/AnimatorProxy.java
rename from mobile/android/base/animation/BounceAnimatorBuilder.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/BounceAnimatorBuilder.java
rename from mobile/android/base/animation/HeightChangeAnimation.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/HeightChangeAnimation.java
rename from mobile/android/base/animation/PropertyAnimator.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/PropertyAnimator.java
rename from mobile/android/base/animation/Rotate3DAnimation.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/Rotate3DAnimation.java
rename from mobile/android/base/animation/TransitionsTracker.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/TransitionsTracker.java
rename from mobile/android/base/animation/ViewHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/animation/ViewHelper.java
rename from mobile/android/base/annotation/JNITarget.java
rename to mobile/android/base/java/org/mozilla/gecko/annotation/JNITarget.java
rename from mobile/android/base/annotation/ReflectionTarget.java
rename to mobile/android/base/java/org/mozilla/gecko/annotation/ReflectionTarget.java
rename from mobile/android/base/annotation/RobocopTarget.java
rename to mobile/android/base/java/org/mozilla/gecko/annotation/RobocopTarget.java
rename from mobile/android/base/annotation/WebRTCJNITarget.java
rename to mobile/android/base/java/org/mozilla/gecko/annotation/WebRTCJNITarget.java
rename from mobile/android/base/annotation/WrapForJNI.java
rename to mobile/android/base/java/org/mozilla/gecko/annotation/WrapForJNI.java
rename from mobile/android/base/db/AbstractPerProfileDatabaseProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/AbstractPerProfileDatabaseProvider.java
rename from mobile/android/base/db/AbstractTransactionalProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/AbstractTransactionalProvider.java
rename from mobile/android/base/db/BaseTable.java
rename to mobile/android/base/java/org/mozilla/gecko/db/BaseTable.java
rename from mobile/android/base/db/BrowserContract.java
rename to mobile/android/base/java/org/mozilla/gecko/db/BrowserContract.java
rename from mobile/android/base/db/BrowserDB.java
rename to mobile/android/base/java/org/mozilla/gecko/db/BrowserDB.java
rename from mobile/android/base/db/BrowserDatabaseHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/db/BrowserDatabaseHelper.java
rename from mobile/android/base/db/BrowserProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/BrowserProvider.java
rename from mobile/android/base/db/DBUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/db/DBUtils.java
rename from mobile/android/base/db/FormHistoryProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/FormHistoryProvider.java
rename from mobile/android/base/db/HomeProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/HomeProvider.java
rename from mobile/android/base/db/LocalBrowserDB.java
rename to mobile/android/base/java/org/mozilla/gecko/db/LocalBrowserDB.java
rename from mobile/android/base/db/LocalReadingListAccessor.java
rename to mobile/android/base/java/org/mozilla/gecko/db/LocalReadingListAccessor.java
rename from mobile/android/base/db/LocalSearches.java
rename to mobile/android/base/java/org/mozilla/gecko/db/LocalSearches.java
rename from mobile/android/base/db/LocalTabsAccessor.java
rename to mobile/android/base/java/org/mozilla/gecko/db/LocalTabsAccessor.java
rename from mobile/android/base/db/LocalURLMetadata.java
rename to mobile/android/base/java/org/mozilla/gecko/db/LocalURLMetadata.java
rename from mobile/android/base/db/PasswordsProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/PasswordsProvider.java
rename from mobile/android/base/db/PerProfileDatabaseProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/PerProfileDatabaseProvider.java
rename from mobile/android/base/db/PerProfileDatabases.java
rename to mobile/android/base/java/org/mozilla/gecko/db/PerProfileDatabases.java
rename from mobile/android/base/db/ReadingListAccessor.java
rename to mobile/android/base/java/org/mozilla/gecko/db/ReadingListAccessor.java
rename from mobile/android/base/db/ReadingListProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/ReadingListProvider.java
rename from mobile/android/base/db/RemoteClient.java
rename to mobile/android/base/java/org/mozilla/gecko/db/RemoteClient.java
rename from mobile/android/base/db/RemoteTab.java
rename to mobile/android/base/java/org/mozilla/gecko/db/RemoteTab.java
rename from mobile/android/base/db/SQLiteBridgeContentProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/SQLiteBridgeContentProvider.java
rename from mobile/android/base/db/SearchHistoryProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/SearchHistoryProvider.java
rename from mobile/android/base/db/Searches.java
rename to mobile/android/base/java/org/mozilla/gecko/db/Searches.java
rename from mobile/android/base/db/SharedBrowserDatabaseProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/SharedBrowserDatabaseProvider.java
rename from mobile/android/base/db/StubBrowserDB.java
rename to mobile/android/base/java/org/mozilla/gecko/db/StubBrowserDB.java
rename from mobile/android/base/db/SuggestedSites.java
rename to mobile/android/base/java/org/mozilla/gecko/db/SuggestedSites.java
rename from mobile/android/base/db/Table.java
rename to mobile/android/base/java/org/mozilla/gecko/db/Table.java
rename from mobile/android/base/db/TabsAccessor.java
rename to mobile/android/base/java/org/mozilla/gecko/db/TabsAccessor.java
rename from mobile/android/base/db/TabsProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/db/TabsProvider.java
rename from mobile/android/base/db/TopSitesCursorWrapper.java
rename to mobile/android/base/java/org/mozilla/gecko/db/TopSitesCursorWrapper.java
rename from mobile/android/base/db/URLMetadata.java
rename to mobile/android/base/java/org/mozilla/gecko/db/URLMetadata.java
rename from mobile/android/base/db/URLMetadataTable.java
rename to mobile/android/base/java/org/mozilla/gecko/db/URLMetadataTable.java
rename from mobile/android/base/distribution/Distribution.java
rename to mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java
rename from mobile/android/base/distribution/ReferrerDescriptor.java
rename to mobile/android/base/java/org/mozilla/gecko/distribution/ReferrerDescriptor.java
rename from mobile/android/base/distribution/ReferrerReceiver.java
rename to mobile/android/base/java/org/mozilla/gecko/distribution/ReferrerReceiver.java
rename from mobile/android/base/dlc/DownloadContentHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/dlc/DownloadContentHelper.java
rename from mobile/android/base/dlc/DownloadContentService.java
rename to mobile/android/base/java/org/mozilla/gecko/dlc/DownloadContentService.java
rename from mobile/android/base/dlc/catalog/DownloadContent.java
rename to mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContent.java
rename from mobile/android/base/dlc/catalog/DownloadContentBootstrap.java
rename to mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentBootstrap.java
rename from mobile/android/base/dlc/catalog/DownloadContentCatalog.java
rename to mobile/android/base/java/org/mozilla/gecko/dlc/catalog/DownloadContentCatalog.java
rename from mobile/android/base/favicons/Favicons.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/Favicons.java
rename from mobile/android/base/favicons/LoadFaviconTask.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/LoadFaviconTask.java
rename from mobile/android/base/favicons/OnFaviconLoadedListener.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/OnFaviconLoadedListener.java
rename from mobile/android/base/favicons/RemoteFavicon.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/RemoteFavicon.java
rename from mobile/android/base/favicons/cache/FaviconCache.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/cache/FaviconCache.java
rename from mobile/android/base/favicons/cache/FaviconCacheElement.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/cache/FaviconCacheElement.java
rename from mobile/android/base/favicons/cache/FaviconsForURL.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/cache/FaviconsForURL.java
rename from mobile/android/base/favicons/decoders/FaviconDecoder.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/decoders/FaviconDecoder.java
rename from mobile/android/base/favicons/decoders/ICODecoder.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/decoders/ICODecoder.java
rename from mobile/android/base/favicons/decoders/IconDirectoryEntry.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/decoders/IconDirectoryEntry.java
rename from mobile/android/base/favicons/decoders/LoadFaviconResult.java
rename to mobile/android/base/java/org/mozilla/gecko/favicons/decoders/LoadFaviconResult.java
rename from mobile/android/base/firstrun/FirstrunPager.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPager.java
rename from mobile/android/base/firstrun/FirstrunPagerConfig.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPagerConfig.java
rename from mobile/android/base/firstrun/FirstrunPane.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPane.java
rename from mobile/android/base/firstrun/FirstrunPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
rename from mobile/android/base/firstrun/ImportPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/ImportPanel.java
rename from mobile/android/base/firstrun/RestrictedWelcomePanel.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/RestrictedWelcomePanel.java
rename from mobile/android/base/firstrun/SyncPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/SyncPanel.java
rename from mobile/android/base/firstrun/WelcomePanel.java
rename to mobile/android/base/java/org/mozilla/gecko/firstrun/WelcomePanel.java
rename from mobile/android/base/gfx/Axis.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/Axis.java
rename from mobile/android/base/gfx/BitmapUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/BitmapUtils.java
rename from mobile/android/base/gfx/BufferedImage.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/BufferedImage.java
rename from mobile/android/base/gfx/BufferedImageGLInfo.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/BufferedImageGLInfo.java
rename from mobile/android/base/gfx/DisplayPortCalculator.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/DisplayPortCalculator.java
rename from mobile/android/base/gfx/DisplayPortMetrics.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/DisplayPortMetrics.java
rename from mobile/android/base/gfx/DrawTimingQueue.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/DrawTimingQueue.java
rename from mobile/android/base/gfx/DynamicToolbarAnimator.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/DynamicToolbarAnimator.java
rename from mobile/android/base/gfx/FloatSize.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/FloatSize.java
rename from mobile/android/base/gfx/FullScreenState.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/FullScreenState.java
rename from mobile/android/base/gfx/GLController.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/GLController.java
rename from mobile/android/base/gfx/GeckoLayerClient.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
rename from mobile/android/base/gfx/ImmutableViewportMetrics.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/ImmutableViewportMetrics.java
rename from mobile/android/base/gfx/IntSize.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/IntSize.java
rename from mobile/android/base/gfx/JavaPanZoomController.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/JavaPanZoomController.java
rename from mobile/android/base/gfx/Layer.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/Layer.java
rename from mobile/android/base/gfx/LayerRenderer.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/LayerRenderer.java
rename from mobile/android/base/gfx/LayerView.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/LayerView.java
rename from mobile/android/base/gfx/NativePanZoomController.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/NativePanZoomController.java
rename from mobile/android/base/gfx/Overscroll.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/Overscroll.java
rename from mobile/android/base/gfx/OverscrollEdgeEffect.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/OverscrollEdgeEffect.java
rename from mobile/android/base/gfx/PanZoomController.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/PanZoomController.java
rename from mobile/android/base/gfx/PanZoomTarget.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/PanZoomTarget.java
rename from mobile/android/base/gfx/PanningPerfAPI.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/PanningPerfAPI.java
rename from mobile/android/base/gfx/PluginLayer.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/PluginLayer.java
rename from mobile/android/base/gfx/PointUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/PointUtils.java
rename from mobile/android/base/gfx/ProgressiveUpdateData.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/ProgressiveUpdateData.java
rename from mobile/android/base/gfx/RectUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/RectUtils.java
rename from mobile/android/base/gfx/RenderTask.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/RenderTask.java
rename from mobile/android/base/gfx/ScrollbarLayer.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/ScrollbarLayer.java
rename from mobile/android/base/gfx/SimpleScaleGestureDetector.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/SimpleScaleGestureDetector.java
rename from mobile/android/base/gfx/SubdocumentScrollHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/SubdocumentScrollHelper.java
rename from mobile/android/base/gfx/TextureGenerator.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/TextureGenerator.java
rename from mobile/android/base/gfx/TextureReaper.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/TextureReaper.java
rename from mobile/android/base/gfx/TouchEventHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/TouchEventHandler.java
rename from mobile/android/base/gfx/ViewTransform.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/ViewTransform.java
rename from mobile/android/base/gfx/VirtualLayer.java
rename to mobile/android/base/java/org/mozilla/gecko/gfx/VirtualLayer.java
rename from mobile/android/base/health/BrowserHealthRecorder.java
rename to mobile/android/base/java/org/mozilla/gecko/health/BrowserHealthRecorder.java
rename from mobile/android/base/health/BrowserHealthReporter.java
rename to mobile/android/base/java/org/mozilla/gecko/health/BrowserHealthReporter.java
rename from mobile/android/base/health/HealthRecorder.java
rename to mobile/android/base/java/org/mozilla/gecko/health/HealthRecorder.java
rename from mobile/android/base/health/SessionInformation.java
rename to mobile/android/base/java/org/mozilla/gecko/health/SessionInformation.java
rename from mobile/android/base/health/StubbedHealthRecorder.java
rename to mobile/android/base/java/org/mozilla/gecko/health/StubbedHealthRecorder.java
rename from mobile/android/base/home/BookmarkFolderView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/BookmarkFolderView.java
rename from mobile/android/base/home/BookmarksListAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/BookmarksListAdapter.java
rename from mobile/android/base/home/BookmarksListView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/BookmarksListView.java
rename from mobile/android/base/home/BookmarksPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/BookmarksPanel.java
rename from mobile/android/base/home/BrowserSearch.java
rename to mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
rename from mobile/android/base/home/DynamicPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/DynamicPanel.java
rename from mobile/android/base/home/FramePanelLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/home/FramePanelLayout.java
rename from mobile/android/base/home/HistoryHeaderListCursorAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HistoryHeaderListCursorAdapter.java
rename from mobile/android/base/home/HistoryItemAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HistoryItemAdapter.java
rename from mobile/android/base/home/HistoryPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HistoryPanel.java
rename from mobile/android/base/home/HomeAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeAdapter.java
rename from mobile/android/base/home/HomeBanner.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeBanner.java
rename from mobile/android/base/home/HomeConfig.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeConfig.java
rename from mobile/android/base/home/HomeConfigLoader.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeConfigLoader.java
rename from mobile/android/base/home/HomeConfigPrefsBackend.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeConfigPrefsBackend.java
rename from mobile/android/base/home/HomeContextMenuInfo.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeContextMenuInfo.java
rename from mobile/android/base/home/HomeExpandableListView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeExpandableListView.java
rename from mobile/android/base/home/HomeFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java
rename from mobile/android/base/home/HomeListView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomeListView.java
rename from mobile/android/base/home/HomePager.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomePager.java
rename from mobile/android/base/home/HomePanelsManager.java
rename to mobile/android/base/java/org/mozilla/gecko/home/HomePanelsManager.java
rename from mobile/android/base/home/ImageLoader.java
rename to mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java
rename from mobile/android/base/home/MultiTypeCursorAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/MultiTypeCursorAdapter.java
rename from mobile/android/base/home/PanelAuthCache.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelAuthCache.java
rename from mobile/android/base/home/PanelAuthLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelAuthLayout.java
rename from mobile/android/base/home/PanelBackItemView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelBackItemView.java
rename from mobile/android/base/home/PanelHeaderView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelHeaderView.java
rename from mobile/android/base/home/PanelInfoManager.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelInfoManager.java
rename from mobile/android/base/home/PanelItemView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelItemView.java
rename from mobile/android/base/home/PanelLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelLayout.java
rename from mobile/android/base/home/PanelListView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelListView.java
rename from mobile/android/base/home/PanelRecyclerView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelRecyclerView.java
rename from mobile/android/base/home/PanelRecyclerViewAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelRecyclerViewAdapter.java
rename from mobile/android/base/home/PanelRefreshLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelRefreshLayout.java
rename from mobile/android/base/home/PanelViewAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelViewAdapter.java
rename from mobile/android/base/home/PanelViewItemHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PanelViewItemHandler.java
rename from mobile/android/base/home/PinSiteDialog.java
rename to mobile/android/base/java/org/mozilla/gecko/home/PinSiteDialog.java
rename from mobile/android/base/home/ReadingListPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/ReadingListPanel.java
rename from mobile/android/base/home/ReadingListRow.java
rename to mobile/android/base/java/org/mozilla/gecko/home/ReadingListRow.java
rename from mobile/android/base/home/RecentTabsPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RecentTabsPanel.java
rename from mobile/android/base/home/RemoteTabsBaseFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RemoteTabsBaseFragment.java
rename from mobile/android/base/home/RemoteTabsExpandableListFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RemoteTabsExpandableListFragment.java
rename from mobile/android/base/home/RemoteTabsExpandableListState.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RemoteTabsExpandableListState.java
rename from mobile/android/base/home/RemoteTabsPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RemoteTabsPanel.java
rename from mobile/android/base/home/RemoteTabsSplitPlaneFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RemoteTabsSplitPlaneFragment.java
rename from mobile/android/base/home/RemoteTabsStaticFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/home/RemoteTabsStaticFragment.java
rename from mobile/android/base/home/SearchEngine.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SearchEngine.java
rename from mobile/android/base/home/SearchEngineAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SearchEngineAdapter.java
rename from mobile/android/base/home/SearchEngineBar.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SearchEngineBar.java
rename from mobile/android/base/home/SearchEngineRow.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java
rename from mobile/android/base/home/SearchLoader.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SearchLoader.java
rename from mobile/android/base/home/SimpleCursorLoader.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SimpleCursorLoader.java
rename from mobile/android/base/home/SpacingDecoration.java
rename to mobile/android/base/java/org/mozilla/gecko/home/SpacingDecoration.java
rename from mobile/android/base/home/TabMenuStrip.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TabMenuStrip.java
rename from mobile/android/base/home/TabMenuStripLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TabMenuStripLayout.java
rename from mobile/android/base/home/TopSitesGridItemView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TopSitesGridItemView.java
rename from mobile/android/base/home/TopSitesGridView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TopSitesGridView.java
rename from mobile/android/base/home/TopSitesPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TopSitesPanel.java
rename from mobile/android/base/home/TopSitesThumbnailView.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TopSitesThumbnailView.java
rename from mobile/android/base/home/TransitionAwareCursorLoaderCallbacks.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TransitionAwareCursorLoaderCallbacks.java
rename from mobile/android/base/home/TwoLinePageRow.java
rename to mobile/android/base/java/org/mozilla/gecko/home/TwoLinePageRow.java
rename from mobile/android/base/javaaddons/JavaAddonManager.java
rename to mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManager.java
rename from mobile/android/base/javaaddons/JavaAddonManagerV1.java
rename to mobile/android/base/java/org/mozilla/gecko/javaaddons/JavaAddonManagerV1.java
rename from mobile/android/base/lwt/LightweightTheme.java
rename to mobile/android/base/java/org/mozilla/gecko/lwt/LightweightTheme.java
rename from mobile/android/base/lwt/LightweightThemeDrawable.java
rename to mobile/android/base/java/org/mozilla/gecko/lwt/LightweightThemeDrawable.java
rename from mobile/android/base/mdns/MulticastDNSManager.java
rename to mobile/android/base/java/org/mozilla/gecko/mdns/MulticastDNSManager.java
rename from mobile/android/base/menu/GeckoMenu.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/GeckoMenu.java
rename from mobile/android/base/menu/GeckoMenuInflater.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/GeckoMenuInflater.java
rename from mobile/android/base/menu/GeckoMenuItem.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/GeckoMenuItem.java
rename from mobile/android/base/menu/GeckoSubMenu.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/GeckoSubMenu.java
rename from mobile/android/base/menu/MenuItemActionBar.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/MenuItemActionBar.java
rename from mobile/android/base/menu/MenuItemDefault.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/MenuItemDefault.java
rename from mobile/android/base/menu/MenuItemSwitcherLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/MenuItemSwitcherLayout.java
rename from mobile/android/base/menu/MenuPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/MenuPanel.java
rename from mobile/android/base/menu/MenuPopup.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/MenuPopup.java
rename from mobile/android/base/menu/QuickShareBarActionView.java
rename to mobile/android/base/java/org/mozilla/gecko/menu/QuickShareBarActionView.java
rename from mobile/android/base/mozglue/ByteBufferInputStream.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/ByteBufferInputStream.java
rename from mobile/android/base/mozglue/ContextUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/ContextUtils.java
rename from mobile/android/base/mozglue/DirectBufferAllocator.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/DirectBufferAllocator.java
rename from mobile/android/base/mozglue/GeckoLoader.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/GeckoLoader.java
rename from mobile/android/base/mozglue/JNIObject.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/JNIObject.java
rename from mobile/android/base/mozglue/NativeReference.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/NativeReference.java
rename from mobile/android/base/mozglue/NativeZip.java
rename to mobile/android/base/java/org/mozilla/gecko/mozglue/NativeZip.java
rename from mobile/android/base/overlays/OverlayConstants.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/OverlayConstants.java
rename from mobile/android/base/overlays/service/OverlayActionService.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/service/OverlayActionService.java
rename from mobile/android/base/overlays/service/ShareData.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/service/ShareData.java
rename from mobile/android/base/overlays/service/sharemethods/AddBookmark.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/AddBookmark.java
rename from mobile/android/base/overlays/service/sharemethods/AddToReadingList.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/AddToReadingList.java
rename from mobile/android/base/overlays/service/sharemethods/SendTab.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/SendTab.java
rename from mobile/android/base/overlays/service/sharemethods/ShareMethod.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/service/sharemethods/ShareMethod.java
rename from mobile/android/base/overlays/ui/OverlayDialogButton.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/ui/OverlayDialogButton.java
rename from mobile/android/base/overlays/ui/SendTabDeviceListArrayAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/ui/SendTabDeviceListArrayAdapter.java
rename from mobile/android/base/overlays/ui/SendTabList.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/ui/SendTabList.java
rename from mobile/android/base/overlays/ui/SendTabTargetSelectedListener.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/ui/SendTabTargetSelectedListener.java
rename from mobile/android/base/overlays/ui/ShareDialog.java
rename to mobile/android/base/java/org/mozilla/gecko/overlays/ui/ShareDialog.java
rename from mobile/android/base/preferences/AlignRightLinkPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/AlignRightLinkPreference.java
rename from mobile/android/base/preferences/AndroidImport.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImport.java
rename from mobile/android/base/preferences/AndroidImportPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/AndroidImportPreference.java
rename from mobile/android/base/preferences/ClearOnShutdownPref.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/ClearOnShutdownPref.java
rename from mobile/android/base/preferences/CustomCheckBoxPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/CustomCheckBoxPreference.java
rename from mobile/android/base/preferences/CustomListCategory.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/CustomListCategory.java
rename from mobile/android/base/preferences/CustomListPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/CustomListPreference.java
rename from mobile/android/base/preferences/DistroSharedPrefsImport.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/DistroSharedPrefsImport.java
rename from mobile/android/base/preferences/FontSizePreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/FontSizePreference.java
rename from mobile/android/base/preferences/GeckoPreferenceFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferenceFragment.java
rename from mobile/android/base/preferences/GeckoPreferences.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java
rename from mobile/android/base/preferences/LinkPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/LinkPreference.java
rename from mobile/android/base/preferences/ListCheckboxPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/ListCheckboxPreference.java
rename from mobile/android/base/preferences/LocaleListPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/LocaleListPreference.java
rename from mobile/android/base/preferences/ModifiableHintPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/ModifiableHintPreference.java
rename from mobile/android/base/preferences/MultiChoicePreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/MultiChoicePreference.java
rename from mobile/android/base/preferences/MultiPrefMultiChoicePreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/MultiPrefMultiChoicePreference.java
rename from mobile/android/base/preferences/PanelsPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/PanelsPreference.java
rename from mobile/android/base/preferences/PanelsPreferenceCategory.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/PanelsPreferenceCategory.java
rename from mobile/android/base/preferences/PrivateDataPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/PrivateDataPreference.java
rename from mobile/android/base/preferences/SearchEnginePreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/SearchEnginePreference.java
rename from mobile/android/base/preferences/SearchPreferenceCategory.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/SearchPreferenceCategory.java
rename from mobile/android/base/preferences/SetHomepagePreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/SetHomepagePreference.java
rename from mobile/android/base/preferences/SyncPreference.java
rename to mobile/android/base/java/org/mozilla/gecko/preferences/SyncPreference.java
rename from mobile/android/base/prompts/ColorPickerInput.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/ColorPickerInput.java
rename from mobile/android/base/prompts/IconGridInput.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/IconGridInput.java
rename from mobile/android/base/prompts/IntentChooserPrompt.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/IntentChooserPrompt.java
rename from mobile/android/base/prompts/IntentHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/IntentHandler.java
rename from mobile/android/base/prompts/Prompt.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/Prompt.java
rename from mobile/android/base/prompts/PromptInput.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/PromptInput.java
rename from mobile/android/base/prompts/PromptListAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/PromptListAdapter.java
rename from mobile/android/base/prompts/PromptListItem.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/PromptListItem.java
rename from mobile/android/base/prompts/PromptService.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/PromptService.java
rename from mobile/android/base/prompts/TabInput.java
rename to mobile/android/base/java/org/mozilla/gecko/prompts/TabInput.java
rename from mobile/android/base/restrictions/DefaultConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/DefaultConfiguration.java
rename from mobile/android/base/restrictions/GuestProfileConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/GuestProfileConfiguration.java
rename from mobile/android/base/restrictions/Restrictable.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/Restrictable.java
rename from mobile/android/base/restrictions/RestrictedProfileConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictedProfileConfiguration.java
rename from mobile/android/base/restrictions/RestrictionConfiguration.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionConfiguration.java
rename from mobile/android/base/restrictions/RestrictionProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/restrictions/RestrictionProvider.java
rename from mobile/android/base/sqlite/ByteBufferInputStream.java
rename to mobile/android/base/java/org/mozilla/gecko/sqlite/ByteBufferInputStream.java
rename from mobile/android/base/sqlite/MatrixBlobCursor.java
rename to mobile/android/base/java/org/mozilla/gecko/sqlite/MatrixBlobCursor.java
rename from mobile/android/base/sqlite/SQLiteBridge.java
rename to mobile/android/base/java/org/mozilla/gecko/sqlite/SQLiteBridge.java
rename from mobile/android/base/sqlite/SQLiteBridgeException.java
rename to mobile/android/base/java/org/mozilla/gecko/sqlite/SQLiteBridgeException.java
rename from mobile/android/base/tabqueue/TabQueueDispatcher.java
rename to mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueueDispatcher.java
rename from mobile/android/base/tabqueue/TabQueueHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueueHelper.java
rename from mobile/android/base/tabqueue/TabQueuePrompt.java
rename to mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueuePrompt.java
rename from mobile/android/base/tabqueue/TabQueueService.java
rename to mobile/android/base/java/org/mozilla/gecko/tabqueue/TabQueueService.java
rename from mobile/android/base/tabqueue/TabReceivedService.java
rename to mobile/android/base/java/org/mozilla/gecko/tabqueue/TabReceivedService.java
rename from mobile/android/base/tabs/PrivateTabsPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/PrivateTabsPanel.java
rename from mobile/android/base/tabs/TabCurve.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabCurve.java
rename from mobile/android/base/tabs/TabHistoryController.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryController.java
rename from mobile/android/base/tabs/TabHistoryFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryFragment.java
rename from mobile/android/base/tabs/TabHistoryItemRow.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryItemRow.java
rename from mobile/android/base/tabs/TabHistoryPage.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabHistoryPage.java
rename from mobile/android/base/tabs/TabPanelBackButton.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabPanelBackButton.java
rename from mobile/android/base/tabs/TabStrip.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabStrip.java
rename from mobile/android/base/tabs/TabStripAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabStripAdapter.java
rename from mobile/android/base/tabs/TabStripItemView.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabStripItemView.java
rename from mobile/android/base/tabs/TabStripView.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabStripView.java
rename from mobile/android/base/tabs/TabsGridLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabsGridLayout.java
rename from mobile/android/base/tabs/TabsLayoutAdapter.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutAdapter.java
rename from mobile/android/base/tabs/TabsLayoutItemView.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabsLayoutItemView.java
rename from mobile/android/base/tabs/TabsListLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabsListLayout.java
rename from mobile/android/base/tabs/TabsPanel.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanel.java
rename from mobile/android/base/tabs/TabsPanelThumbnailView.java
rename to mobile/android/base/java/org/mozilla/gecko/tabs/TabsPanelThumbnailView.java
rename from mobile/android/base/tiles/Tile.java
rename to mobile/android/base/java/org/mozilla/gecko/tiles/Tile.java
rename from mobile/android/base/tiles/TilesRecorder.java
rename to mobile/android/base/java/org/mozilla/gecko/tiles/TilesRecorder.java
rename from mobile/android/base/toolbar/AutocompleteHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/AutocompleteHandler.java
rename from mobile/android/base/toolbar/BackButton.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BackButton.java
rename from mobile/android/base/toolbar/BrowserToolbar.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbar.java
rename from mobile/android/base/toolbar/BrowserToolbarPhone.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarPhone.java
rename from mobile/android/base/toolbar/BrowserToolbarPhoneBase.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarPhoneBase.java
rename from mobile/android/base/toolbar/BrowserToolbarPreHC.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarPreHC.java
rename from mobile/android/base/toolbar/BrowserToolbarTablet.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarTablet.java
rename from mobile/android/base/toolbar/BrowserToolbarTabletBase.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/BrowserToolbarTabletBase.java
rename from mobile/android/base/toolbar/CanvasDelegate.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/CanvasDelegate.java
rename from mobile/android/base/toolbar/ForwardButton.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ForwardButton.java
rename from mobile/android/base/toolbar/NavButton.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/NavButton.java
rename from mobile/android/base/toolbar/PageActionLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/PageActionLayout.java
rename from mobile/android/base/toolbar/PhoneTabsButton.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/PhoneTabsButton.java
rename from mobile/android/base/toolbar/ShapedButton.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ShapedButton.java
rename from mobile/android/base/toolbar/ShapedButtonFrameLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ShapedButtonFrameLayout.java
rename from mobile/android/base/toolbar/SiteIdentityPopup.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/SiteIdentityPopup.java
rename from mobile/android/base/toolbar/TabCounter.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/TabCounter.java
rename from mobile/android/base/toolbar/ToolbarDisplayLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java
rename from mobile/android/base/toolbar/ToolbarEditLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditLayout.java
rename from mobile/android/base/toolbar/ToolbarEditText.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarEditText.java
rename from mobile/android/base/toolbar/ToolbarPrefs.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarPrefs.java
rename from mobile/android/base/toolbar/ToolbarProgressView.java
rename to mobile/android/base/java/org/mozilla/gecko/toolbar/ToolbarProgressView.java
rename from mobile/android/base/trackingprotection/TrackingProtectionPrompt.java
rename to mobile/android/base/java/org/mozilla/gecko/trackingprotection/TrackingProtectionPrompt.java
rename from mobile/android/base/updater/UpdateService.java
rename to mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java
rename from mobile/android/base/updater/UpdateServiceHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/updater/UpdateServiceHelper.java
rename from mobile/android/base/util/ActivityResultHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/util/ActivityResultHandler.java
rename from mobile/android/base/util/ActivityResultHandlerMap.java
rename to mobile/android/base/java/org/mozilla/gecko/util/ActivityResultHandlerMap.java
rename from mobile/android/base/util/ActivityUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/ActivityUtils.java
rename from mobile/android/base/util/BundleEventListener.java
rename to mobile/android/base/java/org/mozilla/gecko/util/BundleEventListener.java
rename from mobile/android/base/util/Clipboard.java
rename to mobile/android/base/java/org/mozilla/gecko/util/Clipboard.java
rename from mobile/android/base/util/ColorUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/ColorUtils.java
rename from mobile/android/base/util/DrawableUtil.java
rename to mobile/android/base/java/org/mozilla/gecko/util/DrawableUtil.java
rename from mobile/android/base/util/EventCallback.java
rename to mobile/android/base/java/org/mozilla/gecko/util/EventCallback.java
rename from mobile/android/base/util/FileUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/FileUtils.java
rename from mobile/android/base/util/FloatUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/FloatUtils.java
rename from mobile/android/base/util/GamepadUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/GamepadUtils.java
rename from mobile/android/base/util/GeckoBackgroundThread.java
rename to mobile/android/base/java/org/mozilla/gecko/util/GeckoBackgroundThread.java
rename from mobile/android/base/util/GeckoEventListener.java
rename to mobile/android/base/java/org/mozilla/gecko/util/GeckoEventListener.java
rename from mobile/android/base/util/GeckoJarReader.java
rename to mobile/android/base/java/org/mozilla/gecko/util/GeckoJarReader.java
rename from mobile/android/base/util/GeckoRequest.java
rename to mobile/android/base/java/org/mozilla/gecko/util/GeckoRequest.java
rename from mobile/android/base/util/HardwareCodecCapabilityUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/HardwareCodecCapabilityUtils.java
rename from mobile/android/base/util/HardwareUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/HardwareUtils.java
rename from mobile/android/base/util/INIParser.java
rename to mobile/android/base/java/org/mozilla/gecko/util/INIParser.java
rename from mobile/android/base/util/INISection.java
rename to mobile/android/base/java/org/mozilla/gecko/util/INISection.java
rename from mobile/android/base/util/IOUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/IOUtils.java
rename from mobile/android/base/util/InputOptionsUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/InputOptionsUtils.java
rename from mobile/android/base/util/JSONUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/JSONUtils.java
rename from mobile/android/base/util/MenuUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/MenuUtils.java
rename from mobile/android/base/util/NativeEventListener.java
rename to mobile/android/base/java/org/mozilla/gecko/util/NativeEventListener.java
rename from mobile/android/base/util/NativeJSContainer.java
rename to mobile/android/base/java/org/mozilla/gecko/util/NativeJSContainer.java
rename from mobile/android/base/util/NativeJSObject.java
rename to mobile/android/base/java/org/mozilla/gecko/util/NativeJSObject.java
rename from mobile/android/base/util/NonEvictingLruCache.java
rename to mobile/android/base/java/org/mozilla/gecko/util/NonEvictingLruCache.java
rename from mobile/android/base/util/PrefUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/PrefUtils.java
rename from mobile/android/base/util/ProxySelector.java
rename to mobile/android/base/java/org/mozilla/gecko/util/ProxySelector.java
rename from mobile/android/base/util/RawResource.java
rename to mobile/android/base/java/org/mozilla/gecko/util/RawResource.java
rename from mobile/android/base/util/StringUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/StringUtils.java
rename from mobile/android/base/util/ThreadUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/ThreadUtils.java
rename from mobile/android/base/util/UIAsyncTask.java
rename to mobile/android/base/java/org/mozilla/gecko/util/UIAsyncTask.java
rename from mobile/android/base/util/UnusedResourcesUtil.java
rename to mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
rename from mobile/android/base/util/WeakReferenceHandler.java
rename to mobile/android/base/java/org/mozilla/gecko/util/WeakReferenceHandler.java
rename from mobile/android/base/util/WebActivityMapper.java
rename to mobile/android/base/java/org/mozilla/gecko/util/WebActivityMapper.java
rename from mobile/android/base/util/WindowUtils.java
rename to mobile/android/base/java/org/mozilla/gecko/util/WindowUtils.java
rename from mobile/android/base/webapp/Allocator.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/Allocator.java
rename from mobile/android/base/webapp/ApkResources.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/ApkResources.java
rename from mobile/android/base/webapp/Dispatcher.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/Dispatcher.java
rename from mobile/android/base/webapp/EventListener.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/EventListener.java
rename from mobile/android/base/webapp/InstallHelper.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/InstallHelper.java
rename from mobile/android/base/webapp/InstallListener.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/InstallListener.java
rename from mobile/android/base/webapp/TaskKiller.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/TaskKiller.java
rename from mobile/android/base/webapp/UninstallListener.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/UninstallListener.java
rename from mobile/android/base/webapp/WebappImpl.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/WebappImpl.java
rename from mobile/android/base/webapp/Webapps.java
rename to mobile/android/base/java/org/mozilla/gecko/webapp/Webapps.java
rename from mobile/android/base/widget/ActivityChooserModel.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ActivityChooserModel.java
rename from mobile/android/base/widget/AllCapsTextView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/AllCapsTextView.java
rename from mobile/android/base/widget/AnchoredPopup.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/AnchoredPopup.java
rename from mobile/android/base/widget/AnimatedHeightLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/AnimatedHeightLayout.java
rename from mobile/android/base/widget/BasicColorPicker.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/BasicColorPicker.java
rename from mobile/android/base/widget/ButtonToast.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ButtonToast.java
rename from mobile/android/base/widget/CheckableLinearLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/CheckableLinearLayout.java
rename from mobile/android/base/widget/ClickableWhenDisabledEditText.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ClickableWhenDisabledEditText.java
rename from mobile/android/base/widget/ContentSecurityDoorHanger.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ContentSecurityDoorHanger.java
rename from mobile/android/base/widget/CropImageView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/CropImageView.java
rename from mobile/android/base/widget/DateTimePicker.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/DateTimePicker.java
rename from mobile/android/base/widget/DefaultDoorHanger.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/DefaultDoorHanger.java
rename from mobile/android/base/widget/Divider.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/Divider.java
rename from mobile/android/base/widget/DoorHanger.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/DoorHanger.java
rename from mobile/android/base/widget/DoorhangerConfig.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/DoorhangerConfig.java
rename from mobile/android/base/widget/EllipsisTextView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/EllipsisTextView.java
rename from mobile/android/base/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ExternalIntentDuringPrivateBrowsingPromptFragment.java
rename from mobile/android/base/widget/FadedMultiColorTextView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/FadedMultiColorTextView.java
rename from mobile/android/base/widget/FadedSingleColorTextView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/FadedSingleColorTextView.java
rename from mobile/android/base/widget/FadedTextView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/FadedTextView.java
rename from mobile/android/base/widget/FaviconView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/FaviconView.java
rename from mobile/android/base/widget/FloatingHintEditText.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/FloatingHintEditText.java
rename from mobile/android/base/widget/FlowLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/FlowLayout.java
rename from mobile/android/base/widget/GeckoActionProvider.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/GeckoActionProvider.java
rename from mobile/android/base/widget/GeckoPopupMenu.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/GeckoPopupMenu.java
rename from mobile/android/base/widget/GeckoViewFlipper.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/GeckoViewFlipper.java
rename from mobile/android/base/widget/IconTabWidget.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/IconTabWidget.java
rename from mobile/android/base/widget/LoginDoorHanger.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/LoginDoorHanger.java
rename from mobile/android/base/widget/RecyclerViewClickSupport.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/RecyclerViewClickSupport.java
rename from mobile/android/base/widget/ResizablePathDrawable.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ResizablePathDrawable.java
rename from mobile/android/base/widget/RoundedCornerLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/RoundedCornerLayout.java
rename from mobile/android/base/widget/SiteLogins.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/SiteLogins.java
rename from mobile/android/base/widget/SquaredImageView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/SquaredImageView.java
rename from mobile/android/base/widget/SquaredRelativeLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/SquaredRelativeLayout.java
rename from mobile/android/base/widget/SwipeDismissListViewTouchListener.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/SwipeDismissListViewTouchListener.java
rename from mobile/android/base/widget/TabThumbnailWrapper.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/TabThumbnailWrapper.java
rename from mobile/android/base/widget/ThumbnailView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/ThumbnailView.java
rename from mobile/android/base/widget/TwoWayView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/TwoWayView.java
rename from mobile/android/base/widget/themed/ThemedEditText.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedEditText.java
rename from mobile/android/base/widget/themed/ThemedFrameLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedFrameLayout.java
rename from mobile/android/base/widget/themed/ThemedImageButton.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageButton.java
rename from mobile/android/base/widget/themed/ThemedImageView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedImageView.java
rename from mobile/android/base/widget/themed/ThemedLinearLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedLinearLayout.java
rename from mobile/android/base/widget/themed/ThemedRelativeLayout.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedRelativeLayout.java
rename from mobile/android/base/widget/themed/ThemedTextSwitcher.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedTextSwitcher.java
rename from mobile/android/base/widget/themed/ThemedTextView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedTextView.java
rename from mobile/android/base/widget/themed/ThemedView.java
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedView.java
rename from mobile/android/base/widget/themed/ThemedView.java.frag
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/ThemedView.java.frag
rename from mobile/android/base/widget/themed/generate_themed_views.py
rename to mobile/android/base/java/org/mozilla/gecko/widget/themed/generate_themed_views.py
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -7,49 +7,49 @@
 DIRS += ['locales']
 SPHINX_TREES['fennec'] = 'docs'
 
 include('android-services.mozbuild')
 
 thirdparty_source_dir = TOPSRCDIR + '/mobile/android/thirdparty/'
 
 constants_jar = add_java_jar('constants')
-constants_jar.sources = [
+constants_jar.sources = ['java/org/mozilla/gecko/' + x for x in [
     'adjust/AdjustHelperInterface.java',
     'annotation/JNITarget.java',
     'annotation/ReflectionTarget.java',
     'annotation/RobocopTarget.java',
     'annotation/WebRTCJNITarget.java',
     'annotation/WrapForJNI.java',
     'db/BrowserContract.java',
     'LocaleManager.java',
     'Locales.java',
     'SysInfo.java',
-]
+]]
 constants_jar.generated_sources = [
     'preprocessed/org/mozilla/gecko/AdjustConstants.java',
     'preprocessed/org/mozilla/gecko/AppConstants.java',
 ]
 constants_jar.extra_jars = [
     CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
 ]
 
 if CONFIG['MOZ_INSTALL_TRACKING']:
-    constants_jar.sources += [
+    constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
         'adjust/AdjustHelper.java',
-    ]
+    ]]
     constants_jar.extra_jars = [
         'gecko-thirdparty-adjust_sdk.jar',
     ]
 else:
-    constants_jar.sources += [
+    constants_jar.sources += ['java/org/mozilla/gecko/' + x for x in [
         'adjust/StubAdjustHelper.java',
-    ]
+    ]]
 
 resjar = add_java_jar('gecko-R')
 resjar.sources = []
 resjar.generated_sources += [
     'org/mozilla/gecko/R.java',
 ]
 
 if CONFIG['ANDROID_SUPPORT_V4_AAR']:
@@ -67,33 +67,33 @@ if CONFIG['ANDROID_DESIGN_AAR']:
 if CONFIG['ANDROID_RECYCLERVIEW_V7_AAR']:
     ANDROID_EXTRA_PACKAGES += ['android.support.v7.recyclerview']
     ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_RECYCLERVIEW_V7_AAR_RES']]
     resjar.generated_sources += ['android/support/v7/recyclerview/R.java']
 
 resjar.javac_flags += ['-Xlint:all']
 
 mgjar = add_java_jar('gecko-mozglue')
-mgjar.sources += [
+mgjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'mozglue/ByteBufferInputStream.java',
     'mozglue/ContextUtils.java',
     'mozglue/DirectBufferAllocator.java',
     'mozglue/GeckoLoader.java',
     'mozglue/JNIObject.java',
     'mozglue/NativeReference.java',
     'mozglue/NativeZip.java',
-]
+]]
 mgjar.generated_sources = [] # Keep it this way.
 mgjar.extra_jars += [
     'constants.jar',
 ]
 mgjar.javac_flags += ['-Xlint:all']
 
 gujar = add_java_jar('gecko-util')
-gujar.sources += [
+gujar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'util/ActivityResultHandler.java',
     'util/ActivityResultHandlerMap.java',
     'util/ActivityUtils.java',
     'util/BundleEventListener.java',
     'util/Clipboard.java',
     'util/ColorUtils.java',
     'util/DrawableUtil.java',
     'util/EventCallback.java',
@@ -120,17 +120,17 @@ gujar.sources += [
     'util/ProxySelector.java',
     'util/RawResource.java',
     'util/StringUtils.java',
     'util/ThreadUtils.java',
     'util/UIAsyncTask.java',
     'util/WeakReferenceHandler.java',
     'util/WebActivityMapper.java',
     'util/WindowUtils.java',
-]
+]]
 gujar.extra_jars = [
     CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
     'constants.jar',
     'gecko-mozglue.jar',
 ]
 gujar.javac_flags += ['-Xlint:all,-deprecation']
@@ -178,17 +178,17 @@ if CONFIG['MOZ_WEBRTC']:
         'gecko-R.jar',
         'gecko-browser.jar',
         'gecko-util.jar',
         'gecko-mozglue.jar',
     ]
     wrjar.javac_flags += ['-Xlint:all,-deprecation,-cast']
 
 gbjar = add_java_jar('gecko-browser')
-gbjar.sources += [
+gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'AboutPages.java',
     'AccountsHelper.java',
     'ActionModeCompat.java',
     'ActionModeCompatView.java',
     'ActivityHandlerHelper.java',
     'AlarmReceiver.java',
     'AndroidGamepadManager.java',
     'animation/AnimationUtils.java',
@@ -612,62 +612,62 @@ gbjar.sources += [
     'widget/SquaredImageView.java',
     'widget/SquaredRelativeLayout.java',
     'widget/SwipeDismissListViewTouchListener.java',
     'widget/TabThumbnailWrapper.java',
     'widget/ThumbnailView.java',
     'widget/TwoWayView.java',
     'ZoomConstraints.java',
     'ZoomedView.java',
-]
+]]
 # The following sources are checked in to version control but
-# generated by a script (widget/themed/generate_themed_views.py).
+# generated by a script (java/org/mozilla/gecko/widget/themed/generate_themed_views.py).
 # If you're editing this list, make sure to edit that script.
-gbjar.sources += [
+gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
     'widget/themed/ThemedEditText.java',
     'widget/themed/ThemedFrameLayout.java',
     'widget/themed/ThemedImageButton.java',
     'widget/themed/ThemedImageView.java',
     'widget/themed/ThemedLinearLayout.java',
     'widget/themed/ThemedRelativeLayout.java',
     'widget/themed/ThemedTextSwitcher.java',
     'widget/themed/ThemedTextView.java',
     'widget/themed/ThemedView.java',
-]
+]]
 gbjar.sources += [ thirdparty_source_dir + f for f in [
     'com/googlecode/eyesfree/braille/selfbraille/ISelfBrailleService.java',
     'com/googlecode/eyesfree/braille/selfbraille/SelfBrailleClient.java',
     'com/googlecode/eyesfree/braille/selfbraille/WriteData.java',
 ] ]
 android_package_dir = CONFIG['ANDROID_PACKAGE_NAME'].replace('.', '/')
 gbjar.generated_sources = [] # Keep it this way.
 gbjar.extra_jars += [
     CONFIG['ANDROID_SUPPORT_ANNOTATIONS_JAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_LIB'],
     CONFIG['ANDROID_SUPPORT_V4_AAR_INTERNAL_LIB'],
     'constants.jar'
 ]
 if CONFIG['MOZ_CRASHREPORTER']:
-    gbjar.sources += [ 'CrashReporter.java' ]
+    gbjar.sources += [ 'java/org/mozilla/gecko/CrashReporter.java' ]
     ANDROID_RES_DIRS += [ 'crashreporter/res' ]
 
 if (CONFIG['MOZ_ANDROID_MAX_SDK_VERSION']):
     max_sdk_version = int(CONFIG['MOZ_ANDROID_MAX_SDK_VERSION'])
 else:
     max_sdk_version = 999
 
 # Only bother to include new tablet code if we're building for tablet-capable
 # OS releases.
 if max_sdk_version >= 11:
-    gbjar.sources += [
+    gbjar.sources += ['java/org/mozilla/gecko/' + x for x in [
         'tabs/TabStrip.java',
         'tabs/TabStripAdapter.java',
         'tabs/TabStripItemView.java',
         'tabs/TabStripView.java'
-    ]
+    ]]
 
 # Selectively include reading list service code.
 if CONFIG['MOZ_ANDROID_READING_LIST_SERVICE']:
     gbjar.sources += reading_list_service_java_files
 
 gbjar.extra_jars += [
     OBJDIR + '/../javaaddons/javaaddons-1.0.jar',
     'gecko-R.jar',
@@ -680,22 +680,22 @@ gbjar.extra_jars += [
 
 moz_native_devices_jars = [
     CONFIG['ANDROID_MEDIAROUTER_V7_AAR_LIB'],
     CONFIG['ANDROID_MEDIAROUTER_V7_AAR_INTERNAL_LIB'],
     CONFIG['ANDROID_PLAY_SERVICES_BASE_AAR_LIB'],
     CONFIG['ANDROID_PLAY_SERVICES_BASEMENT_AAR_LIB'],
     CONFIG['ANDROID_PLAY_SERVICES_CAST_AAR_LIB'],
 ]
-moz_native_devices_sources = [
+moz_native_devices_sources = ['java/org/mozilla/gecko/' + x for x in [
     'ChromeCast.java',
     'GeckoMediaPlayer.java',
     'MediaPlayerManager.java',
     'PresentationMediaPlayerManager.java',
-]
+]]
 if CONFIG['MOZ_NATIVE_DEVICES']:
     gbjar.extra_jars += moz_native_devices_jars
     gbjar.sources += moz_native_devices_sources
 
     if CONFIG['ANDROID_MEDIAROUTER_V7_AAR']:
         ANDROID_EXTRA_PACKAGES += ['android.support.v7.mediarouter']
         ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_MEDIAROUTER_V7_AAR_RES']]
         resjar.generated_sources += ['android/support/v7/mediarouter/R.java']
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -118,17 +118,17 @@ class MachCommands(MachCommandBase):
         srcdir('app/src/robocop', 'mobile/android/tests/browser/robocop/src')
         srcdir('app/src/background', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser', 'mobile/android/tests/browser/junit3/src')
         srcdir('app/src/javaaddons', 'mobile/android/tests/javaaddons/src')
 
         srcdir('base/build.gradle', 'mobile/android/gradle/base/build.gradle')
         srcdir('base/lint.xml', 'mobile/android/gradle/base/lint.xml')
         srcdir('base/src/main/AndroidManifest.xml', 'mobile/android/gradle/base/AndroidManifest.xml')
-        srcdir('base/src/main/java/org/mozilla/gecko', 'mobile/android/base')
+        srcdir('base/src/main/java/org/mozilla/gecko', 'mobile/android/base/java/org/mozilla/gecko')
         srcdir('base/src/main/java/org/mozilla/mozstumbler', 'mobile/android/stumbler/java/org/mozilla/mozstumbler')
         srcdir('base/src/main/java/org/mozilla/search', 'mobile/android/search/java/org/mozilla/search')
         srcdir('base/src/main/java/org/mozilla/javaaddons', 'mobile/android/javaaddons/java/org/mozilla/javaaddons')
         srcdir('base/src/services', 'mobile/android/services/src/main')
         srcdir('base/src/webrtc_audio_device/java', 'media/webrtc/trunk/webrtc/modules/audio_device/android/java/src')
         srcdir('base/src/webrtc_video_capture/java', 'media/webrtc/trunk/webrtc/modules/video_capture/android/java/src')
         srcdir('base/src/webrtc_video_render/java', 'media/webrtc/trunk/webrtc/modules/video_render/android/java/src')
         srcdir('base/src/main/res', 'mobile/android/base/resources')
deleted file mode 100644
--- a/mobile/android/tests/background/junit4/src/org/mozilla/gecko/background/fxa/test/TestFxAccountAgeLockoutHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-package org.mozilla.gecko.background.fxa.test;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mozilla.gecko.background.fxa.FxAccountAgeLockoutHelper;
-import org.mozilla.gecko.background.testhelpers.TestRunner;
-import org.mozilla.gecko.fxa.FxAccountConstants;
-
-import java.util.Calendar;
-
-@RunWith(TestRunner.class)
-public class TestFxAccountAgeLockoutHelper {
-  @Test
-  public void testPassesAgeCheck() {
-    Calendar today = Calendar.getInstance();
-    int birthMonthIndex = today.get(Calendar.MONTH);
-    int birthDate = today.get(Calendar.DATE);
-    int birthYear = today.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    Assert.assertTrue("Minimum age as of today",
-        FxAccountAgeLockoutHelper.passesAgeCheck(birthDate, birthMonthIndex, birthYear));
-
-    Calendar yesterday = Calendar.getInstance();
-    yesterday.add(Calendar.DATE, -1);
-    birthMonthIndex = yesterday.get(Calendar.MONTH);
-    birthDate = yesterday.get(Calendar.DATE);
-    birthYear = yesterday.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    Assert.assertTrue("Minimum age more than by a day",
-        FxAccountAgeLockoutHelper.passesAgeCheck(birthDate, birthMonthIndex, birthYear));
-
-    Calendar tomorrow = Calendar.getInstance();
-    tomorrow.add(Calendar.DATE, 1);
-    birthMonthIndex = tomorrow.get(Calendar.MONTH);
-    birthDate = tomorrow.get(Calendar.DATE);
-    birthYear = tomorrow.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    Assert.assertFalse("Minimum age fails by a day",
-        FxAccountAgeLockoutHelper.passesAgeCheck(birthDate, birthMonthIndex, birthYear));
-
-    Calendar monthBefore = Calendar.getInstance();
-    monthBefore.add(Calendar.MONTH, -1);
-    birthMonthIndex = monthBefore.get(Calendar.MONTH);
-    birthDate = monthBefore.get(Calendar.DATE);
-    birthYear = monthBefore.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    Assert.assertTrue("Minimum age more than by a month",
-        FxAccountAgeLockoutHelper.passesAgeCheck(birthDate, birthMonthIndex, birthYear));
-
-    Calendar monthAfter = Calendar.getInstance();
-    monthAfter.add(Calendar.MONTH, 1);
-    birthMonthIndex = monthAfter.get(Calendar.MONTH);
-    birthDate = monthAfter.get(Calendar.DATE);
-    birthYear = monthAfter.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    Assert.assertFalse("Minimum age fails by a month",
-        FxAccountAgeLockoutHelper.passesAgeCheck(birthDate, birthMonthIndex, birthYear));
-  }
-
-  @Test
-  public void testIsMagicYear() {
-    final Calendar today = Calendar.getInstance();
-    int magicYear = today.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT;
-    Assert.assertTrue("Passes magic year check: year is magic year",
-        FxAccountAgeLockoutHelper.isMagicYear(magicYear));
-
-    int beforeMagicYear = today.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT - 1;
-    Assert.assertFalse("Fails magic year check: year before magic year",
-        FxAccountAgeLockoutHelper.isMagicYear(beforeMagicYear));
-
-    int afterMagicYear = today.get(Calendar.YEAR) - FxAccountConstants.MINIMUM_AGE_TO_CREATE_AN_ACCOUNT + 1;
-    Assert.assertFalse("Fails magic year: year after magic year",
-        FxAccountAgeLockoutHelper.isMagicYear(afterMagicYear));
-  }
-}
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,35 +16,16 @@ if (proc.exitValue() != 0) {
 import groovy.json.JsonSlurper
 def slurper = new JsonSlurper()
 def json = slurper.parseText(standardOutput.toString())
 
 if (json.substs.MOZ_BUILD_APP != 'mobile/android') {
     throw new GradleException("Building with Gradle is only supported for Fennec, i.e., MOZ_BUILD_APP == 'mobile/android'.");
 }
 
-def srcdir = { dst, src ->
-    def d = java.nio.file.Paths.get("${json.topobjdir}/gradle/${dst}")
-    def s = java.nio.file.Paths.get("${json.topsrcdir}/${src}")
-    try {
-        java.nio.file.Files.createDirectories(d.getParent())
-    } catch (java.nio.file.FileAlreadyExistsException e) {
-        // Do nothing.
-    }
-    try {
-        java.nio.file.Files.createSymbolicLink(d, s)
-    } catch (java.nio.file.FileAlreadyExistsException e) {
-        // Do nothing.
-    }
-}
-
-// Since base/ doesn't have the correct package prefix directory structure, we
-// still need to symlink.
-srcdir('base/src/org/mozilla/gecko', 'mobile/android/base')
-
 include ':app'
 include ':base'
 include ':omnijar'
 include ':thirdparty'
 
 project(':app').projectDir = new File("${json.topsrcdir}/mobile/android/app")
 project(':base').projectDir = new File("${json.topsrcdir}/mobile/android/app/base")
 project(':omnijar').projectDir = new File("${json.topsrcdir}/mobile/android/app/omnijar")