mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
449 290 коммитов 613 Ветки 98 Теги 5,8 GiB
Граф коммитов

18243 Коммитов

Автор SHA1 Сообщение Дата
crazyprodigy 7544d36b8f Bug 1210989 - SendTabDeviceListArrayAdapter.java needed to be changed to point to shareplane.png. r=mcomella 
--HG--
extra : transplant_source : %0El%F228%B4%DE%EFrf/4%0D%BF%7Eu%3D%A1j%2A
 2015-11-04 17:20:31 -05:00
crazyprodigy a1feaca054 Bug 1210989 - Removed all the instance of the unused file icon_shareplane.png. r=mcomella 
--HG--
extra : transplant_source : 5%EA%29%9A%96%7B%87%AE%5D%0B%1E%1DA9%B6%A0%84W%03%3D
 2015-11-04 23:39:33 -05:00
crazyprodigy 71b22ed811 Bug 1210989 - Rename overlay_send_tab_icon -> shareplane. r=mcomella 
--HG--
rename : mobile/android/base/resources/drawable-hdpi/overlay_send_tab_icon.png => mobile/android/base/resources/drawable-hdpi/shareplane.png
rename : mobile/android/base/resources/drawable-xhdpi/overlay_send_tab_icon.png => mobile/android/base/resources/drawable-xhdpi/shareplane.png
rename : mobile/android/base/resources/drawable-xxhdpi/overlay_send_tab_icon.png => mobile/android/base/resources/drawable-xxhdpi/shareplane.png
extra : transplant_source : %C4%EB%14%C0%EE%E4%FAI%0Em%87C%C2%3Em%3Cr%21au
 2015-11-03 20:27:29 -05:00
Sanchit Nevgi c01a56578d Bug 1193205 - Added @Override annotation to setExtras() in TopSitesCursorWrapper.java. r=sebastian 2015-10-19 09:26:00 +02:00
crazyprodigy 8b800cf700 Bug 1106903 - Move BaseTest/UITest.runTest into BaseRobocopTest. r=mcomella 
--HG--
extra : transplant_source : %94%E6S%D8/%A5%80%86%89%CE%82%8CH%81R%D4%9D%F4N%91
 2015-11-05 13:29:39 -05:00
Margaret Leibovic 269ac6a3ff Bug 1218557 - Update copy for settings reorg. r=liuche 
--HG--
extra : commitid : 5NBhfL0zoNE
extra : rebase_source : 0cb775f46b3c75b9c752002b5bb5070840bb0689
 2015-11-04 16:09:53 -05:00
Carsten "Tomcat" Book 4d6f05d2f8 merge mozilla-inbound to mozilla-central a=merge 2015-11-09 14:55:30 +01:00
Carsten "Tomcat" Book 503c35caf8 merge fx-team to mozilla-central a=merge 2015-11-09 14:30:43 +01:00
Wes Kocher e98e767258 Merge m-c to b2ginbound, a=merge 
--HG--
extra : commitid : 9BSOpO5MEsb
 2015-11-06 15:14:26 -08:00
sgiles 185a4ee15f Bug 1174228 - Set up TYPE_APP for navigator.getDeviceStorage for B2GDroid r=dhylands 2015-11-06 05:55:40 +00:00
Nick Alexander 2c338cd37d Bug 1222120 - Part 2: Use custom Robolectric test runner. r=vivek 
DONTBUILD NPOTB on a CLOSED TREE

The patch is horrific, but it's just find-and-replace of the test
runner class name, followed by organizing the imports (in the way that
IntelliJ likes them.)

--HG--
extra : commitid : Hg0rjmUWLUD
extra : rebase_source : 98f01c53ea3d2fd3bd0417332bd132149c4fdbdf
extra : amend_source : 016060f30353f5c74cad3b7e8652f225ca62cd34
 2015-11-05 14:01:41 -08:00
Nick Alexander cad5e0726f Bug 1222120 - Part 1: Add custom Robolectric test runner. r=vivek 
This exports the buildDir to Robolectric via an Android-Gradle
buildConfigField, and then lightly massages the existing test runner
to use the exported value.

--HG--
extra : commitid : FKCOBaaJbdn
extra : rebase_source : b47d77c74b6d5179145c9539503a27630a3aa40c
 2015-11-06 10:58:18 -08:00
Nick Alexander fcfe5b7e24 No bug - Add --verbose flag to |mach artifact| commands. r=me 
DONTBUILD NPOTB

--HG--
extra : commitid : GxY2r0xbCEX
extra : rebase_source : 1feebf12f541a700c96d607ff0f7c6d20de7dfbf
 2015-11-05 14:49:33 -08:00
vivek 2575691f51 Bug 1218917 : Fix swipe refresh animation colors r=nalexander 
--HG--
extra : commitid : AURs7V4oLbc
extra : rebase_source : 5d8333d22e7f7fa8e5bbe2e8b78118bc89966530
 2015-11-05 15:37:42 +02:00
Margaret Leibovic ec3288ddf4 Bug 1220833 - (Part 2) Properly select header on tablet when launching preference screen directly. r=sebastian 
--HG--
extra : commitid : IR6v4OWhfE8
extra : rebase_source : 4b7a9bcef9edf12032007e70e8880921f3092ac5
 2015-11-04 11:29:12 -05:00
Sebastian Kaspari 4597e1161a Bug 1119915 - Show toast if APK API range does not match device. r=rnewman 
--HG--
extra : commitid : 3iwwga4cugN
extra : rebase_source : 4d0cc5bc73a0be966cf6d9a2da5768fba319ac58
 2015-11-03 14:09:41 +00:00
Kalpesh Krishna 4e57ac8198 Bug 1212596 - Highlight Remove account in rejection red. r=vivek 
--HG--
extra : rebase_source : 40a4e87f6a1f66dd25630096f069a6b71181789e
 2015-11-06 00:13:44 +02:00
Margaret Leibovic 99907edbf0 backout 4e951da373d7 for 2.3 build bustage 
--HG--
extra : commitid : EEaNhXW361L
 2015-11-05 17:28:04 -05:00
Nick Alexander 44046732fb Bug 1220887 - Make 'base' Gradle project in the srcdir. r=sebastian 
This is the last Gradle project that isn't in the srcdir.  Since base/
doesn't have the correct package prefix directory structure, we still
need to symlink, but we only need one link.  This effectively
deprecates |mach gradle-install|.

This should improve the robustness of our Gradle configuration,
ensuring that we always have projects to import.  Since
settings.gradle executes very early in the IDE import project
sequence: before Gradle project evaluation time, and thus before any
Gradle task is executed, we should always see a complete project.  (It
was possible to see incomplete Gradle configurations if |mach
gradle-install| hadn't been run at just the right time.)

--HG--
extra : commitid : 4zK7U5PAypH
extra : rebase_source : 91f8534a89f0311b36bd39f502e2f7609a1d78b0
 2015-11-03 15:04:39 -08:00
Margaret Leibovic c7aa6f11f0 Bug 1220833 - (Part 2) Properly select header on tablet when launching preference screen directly. r=sebastian 
--HG--
extra : commitid : FOmtMqsG5VX
extra : rebase_source : 3b0abf0cece511d13fa3a7f3778b9cc892b7f73f
extra : histedit_source : 1be3cdf9a6bc5fbc058353ecb5e1b9615eda33cf
 2015-11-04 11:29:12 -05:00
Margaret Leibovic 687444e529 Bug 1220833 - Update data reporting notification to point to privacy preference screen. r=sebastian 
--HG--
extra : commitid : 6DUDMuPme7J
extra : rebase_source : b6cfb919ab72ec47ef8d57c06c29875bd7a9ee98
 2015-11-04 10:48:15 -05:00
Margaret Leibovic 7299e7329c Bug 1219240 - Telemetry probe to measure user interaction with reader view button. r=mfinkle,vladan 
--HG--
extra : commitid : AkVI6BQJXxc
extra : rebase_source : 63312b16c2d837bb986e3af33f20669425273d38
 2015-10-28 17:07:24 -04:00
Michael Comella ec8cfcfa94 Bug 1183659 - Update tab received notification copy. r=nalexander 
The new format is:
  $DeviceName
  $url

If "$DeviceName" is not available, "$BrandName" (e.g. Firefox, Nightly) is
used.

Multiple received tab notifications are not aggregated.

--HG--
extra : commitid : APtf30beoHq
extra : rebase_source : 402c2b3ea16ba75e281e5e7d517d35f8aaf82d10
 2015-11-04 12:27:20 -08:00
Chenxia Liu 56d558f371 Bug 1221113 - Put insecure-login-form doorhanger behind a flag. r=margaret 
--HG--
extra : commitid : 7CMdM89A2ay
extra : rebase_source : e582f2d4c60bf1e672f153700825583baaf070c1
 2015-11-04 16:06:58 -08:00
Michael Comella dea6fd81fb Bug 1214942 - Change action bar colors on 5+. r=sebastian 
The Preferences Activity looks as desired.

We can't get the main activity to have the desired looks because bug 1220309
prevents us from changing the Action Bar back button color from white so we
went with the default style which looks *alright*.

--HG--
extra : commitid : BVhlBkKteVj
extra : rebase_source : 3bc50cb30f0010bf6cbb32b493f21ecce9a67557
 2015-11-02 13:43:51 -08:00
Carsten "Tomcat" Book 0a34392a9e Merge mozilla-central to fx-team 2015-11-05 12:17:28 +01:00
Carsten "Tomcat" Book 704588c507 merge fx-team to mozilla-central a=merge 2015-11-05 11:55:46 +01:00
Carsten "Tomcat" Book 90803a6363 Merge mozilla-central to b2g-inbound 2015-11-04 12:45:40 +01:00
Carsten "Tomcat" Book 3e11f2fe34 merge mozilla-inbound to mozilla-central a=merge 2015-11-04 11:59:46 +01:00
crazyprodigy 487c6f3f32 Bug 1216307 - Remove unused method hasOtherSyncClients. r=mcomella 
--HG--
extra : commitid : 5FuDSqJugxB
extra : rebase_source : e716f6c45b7b16125ed7946993ecdb778afdf8d5
 2015-11-03 04:28:18 -05:00
Daosheng Mu c3d457b528 Bug 1215147 - Enable VR API's on FF for Android by default. r=snorp, r=vlad, r=bz 2015-11-04 01:59:00 +01:00
J. Ryan Stinnett 5d6812e289 Bug 1182722 - Move DevTools l10n files. r=ochameau,glandium,Pike,bgrins 
Move DevTools l10n files under /devtools/client and /devtools/shared.
A script is attached to the bug for l10n repos to migrate their strings.

--HG--
rename : browser/locales/en-US/chrome/browser/devtools/VariablesView.dtd => devtools/client/locales/en-US/VariablesView.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.dtd => devtools/client/locales/en-US/aboutdebugging.dtd
rename : browser/locales/en-US/chrome/browser/devtools/aboutdebugging.properties => devtools/client/locales/en-US/aboutdebugging.properties
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.dtd => devtools/client/locales/en-US/animationinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/animationinspector.properties => devtools/client/locales/en-US/animationinspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/app-manager.properties => devtools/client/locales/en-US/app-manager.properties
rename : browser/locales/en-US/chrome/browser/devtools/appcacheutils.properties => devtools/client/locales/en-US/appcacheutils.properties
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.dtd => devtools/client/locales/en-US/canvasdebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/canvasdebugger.properties => devtools/client/locales/en-US/canvasdebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.dtd => devtools/client/locales/en-US/connection-screen.dtd
rename : browser/locales/en-US/chrome/browser/devtools/connection-screen.properties => devtools/client/locales/en-US/connection-screen.properties
rename : browser/locales/en-US/chrome/browser/devtools/debugger.dtd => devtools/client/locales/en-US/debugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/debugger.properties => devtools/client/locales/en-US/debugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/device.properties => devtools/client/locales/en-US/device.properties
rename : browser/locales/en-US/chrome/browser/devtools/eyedropper.properties => devtools/client/locales/en-US/eyedropper.properties
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.dtd => devtools/client/locales/en-US/filterwidget.dtd
rename : browser/locales/en-US/chrome/browser/devtools/filterwidget.properties => devtools/client/locales/en-US/filterwidget.properties
rename : browser/locales/en-US/chrome/browser/devtools/font-inspector.dtd => devtools/client/locales/en-US/font-inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/graphs.properties => devtools/client/locales/en-US/graphs.properties
rename : browser/locales/en-US/chrome/browser/devtools/har.properties => devtools/client/locales/en-US/har.properties
rename : browser/locales/en-US/chrome/browser/devtools/inspector.dtd => devtools/client/locales/en-US/inspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/inspector.properties => devtools/client/locales/en-US/inspector.properties
rename : browser/locales/en-US/chrome/browser/devtools/jsonview.properties => devtools/client/locales/en-US/jsonview.properties
rename : browser/locales/en-US/chrome/browser/devtools/layoutview.dtd => devtools/client/locales/en-US/layoutview.dtd
rename : browser/locales/en-US/chrome/browser/devtools/markers.properties => devtools/client/locales/en-US/markers.properties
rename : browser/locales/en-US/chrome/browser/devtools/memory.properties => devtools/client/locales/en-US/memory.properties
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.dtd => devtools/client/locales/en-US/netmonitor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/netmonitor.properties => devtools/client/locales/en-US/netmonitor.properties
rename : browser/locales/en-US/chrome/browser/devtools/performance.dtd => devtools/client/locales/en-US/performance.dtd
rename : browser/locales/en-US/chrome/browser/devtools/performance.properties => devtools/client/locales/en-US/performance.properties
rename : browser/locales/en-US/chrome/browser/devtools/projecteditor.properties => devtools/client/locales/en-US/projecteditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.dtd => devtools/client/locales/en-US/promisedebugger.dtd
rename : browser/locales/en-US/chrome/browser/devtools/promisedebugger.properties => devtools/client/locales/en-US/promisedebugger.properties
rename : browser/locales/en-US/chrome/browser/devtools/responsiveUI.properties => devtools/client/locales/en-US/responsiveUI.properties
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.dtd => devtools/client/locales/en-US/scratchpad.dtd
rename : browser/locales/en-US/chrome/browser/devtools/scratchpad.properties => devtools/client/locales/en-US/scratchpad.properties
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.dtd => devtools/client/locales/en-US/shadereditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/shadereditor.properties => devtools/client/locales/en-US/shadereditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/shared.properties => devtools/client/locales/en-US/shared.properties
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.dtd => devtools/client/locales/en-US/sourceeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/sourceeditor.properties => devtools/client/locales/en-US/sourceeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/storage.properties => devtools/client/locales/en-US/storage.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.dtd => devtools/client/locales/en-US/styleeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/styleeditor.properties => devtools/client/locales/en-US/styleeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/styleinspector.dtd => devtools/client/locales/en-US/styleinspector.dtd
rename : browser/locales/en-US/chrome/browser/devtools/tilt.properties => devtools/client/locales/en-US/tilt.properties
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.dtd => devtools/client/locales/en-US/toolbox.dtd
rename : browser/locales/en-US/chrome/browser/devtools/toolbox.properties => devtools/client/locales/en-US/toolbox.properties
rename : browser/locales/en-US/chrome/browser/devtools/webConsole.dtd => devtools/client/locales/en-US/webConsole.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.dtd => devtools/client/locales/en-US/webaudioeditor.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webaudioeditor.properties => devtools/client/locales/en-US/webaudioeditor.properties
rename : browser/locales/en-US/chrome/browser/devtools/webconsole.properties => devtools/client/locales/en-US/webconsole.properties
rename : browser/locales/en-US/chrome/browser/devtools/webide.dtd => devtools/client/locales/en-US/webide.dtd
rename : browser/locales/en-US/chrome/browser/devtools/webide.properties => devtools/client/locales/en-US/webide.properties
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.dtd => devtools/shared/locales/en-US/csscoverage.dtd
rename : toolkit/locales/en-US/chrome/global/devtools/csscoverage.properties => devtools/shared/locales/en-US/csscoverage.properties
rename : toolkit/locales/en-US/chrome/global/devtools/debugger.properties => devtools/shared/locales/en-US/debugger.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gcli.properties => devtools/shared/locales/en-US/gcli.properties
rename : toolkit/locales/en-US/chrome/global/devtools/gclicommands.properties => devtools/shared/locales/en-US/gclicommands.properties
rename : toolkit/locales/en-US/chrome/global/devtools/styleinspector.properties => devtools/shared/locales/en-US/styleinspector.properties
extra : commitid : 8hcm3tr7AAi
 2015-11-04 15:35:53 -06:00
Chenxia Liu e0e723f2ff Bug 1215739 - "Start browsing" link should bring up keyboard/highlight urlbar. r=margaret 
--HG--
extra : commitid : 4MgOfAJFJdX
extra : rebase_source : ccfdae7bdfb375735ec0a245b21fe29015b4e259
extra : amend_source : 5f76c2f6d268fab4a92c88e26edb981f204f10f5
 2015-10-26 11:40:25 -07:00
Sergej Kravcenko db0f60ba3d Bug 1210534 - Search suggestions are not refreshed after single character entered into search field 
--HG--
extra : commitid : KhoOIuIIc0U
extra : rebase_source : e7c0620c5c9016a765b3926fb512e362546c6cf2
 2015-10-21 19:50:15 +03:00
Nick Alexander 6f0d9d66df Bug 1220891 - Let web Firefox Accounts UI ride the trains. r=margaret 
--HG--
extra : commitid : JR43EjRaHgd
extra : rebase_source : b3289317917297c2727db3121db99cfa319dbf3a
extra : histedit_source : 825ee4543ecb6e5527f435fa2868259ffbc5e635
 2015-11-02 15:04:40 -08:00
Margaret Leibovic dffa4fadcb Bug 1216257 - Remove disabled tests and associated strings. r=gbrown 
--HG--
extra : commitid : IAOCwhi4kl7
extra : rebase_source : 14d5e546816a65720c6eed818b6c9bc986b7bb0e
 2015-10-23 19:03:33 -04:00
Margaret Leibovic fdb97e5393 Bug 1216257 - Move settings items that don't belong elsewhere to "Advanced". r=sebastian 
--HG--
extra : commitid : JodlP6Adn00
extra : rebase_source : ff60843ae82d358cf51dae8c4c956fb8f12a8ce0
 2015-10-23 14:30:05 -04:00
Margaret Leibovic d6b688d735 Bug 1216257 - Move data reporting prefs to "Privacy". r=sebastian 
--HG--
extra : commitid : 5SamCjiZZwL
extra : rebase_source : dff29fe60093b5a0a4bf9de3ba1e6b810c017498
 2015-10-23 13:49:42 -04:00
Margaret Leibovic ae2e6285a6 Bug 1216257 - Rearrange privacy prefs to match spec. r=sebastian 
--HG--
extra : commitid : Li0bHhI54uh
extra : rebase_source : c70f80da7a29012ca9468b3ed096ee371bdb5fc9
 2015-10-23 13:43:00 -04:00
Margaret Leibovic bd72a6ddb0 Bug 1216257 - Rearrange search settings to match spec. r=sebastian 
--HG--
extra : commitid : ATsucXS0URg
extra : rebase_source : 2e37db9dcb8c73a634b512d59e2e31e57e177f8a
 2015-10-23 13:35:09 -04:00
Margaret Leibovic bb986dc7d1 Bug 1216257 - Move full-screen browsing pref to "General". r=sebastian 
--HG--
extra : commitid : KP0SfaQqrm9
extra : rebase_source : 95712c79da10ef6bdf4df6f49388cccf997f9c9c
 2015-10-23 13:22:06 -04:00
Margaret Leibovic c9b6252af3 Bug 1216257 - Move titlebar pref to "General". r=sebastian 
--HG--
extra : commitid : EcmICoojGAG
extra : rebase_source : 48f438779717a1b342b746aa317994e103f38194
 2015-10-23 12:56:21 -04:00
Margaret Leibovic c4550d3025 Bug 1216257 - Move tap-to-load images pref from to "Advanced". r=sebastian 
--HG--
extra : commitid : Kkd69v2XbiI
extra : rebase_source : d0244cf9f8f1681c80baf1b24bd10a4cadcdc853
 2015-10-23 12:40:38 -04:00
Margaret Leibovic 806ca2ca2e Bug 1216257 - Move restore tabs pref from to "Advanced". r=sebastian 
--HG--
extra : commitid : ELTMgv2y6Z6
extra : rebase_source : e1dd9c805e8d6add514d60c5e8b252e58c565c96
 2015-10-23 12:26:33 -04:00
Margaret Leibovic 394390fdac Bug 1216257 - Move clear private data setting to top level. r=sebastian 
--HG--
extra : commitid : GbLRELSCVyd
extra : rebase_source : 8a9e5811a90d4c8c35ed13a67fe33532c9096b4c
 2015-10-21 16:54:04 -04:00
Margaret Leibovic 547bebd081 Bug 1216257 - Move "Language" settting to "General" section r=rnewman 
--HG--
extra : commitid : 1WLDwYGz0Xh
extra : rebase_source : d85f39aeb0ebf9137ad2d3a0b5f4fe95f46dc722
 2015-10-21 16:33:06 -04:00
Margaret Leibovic 31f8f03122 Bug 1216257 - Rename "Developer Tools" category to "Advanced" r=sebastian 
--HG--
rename : mobile/android/base/resources/xml/preferences_devtools.xml => mobile/android/base/resources/xml/preferences_advanced.xml
extra : commitid : I1TDuLqfzgf
extra : rebase_source : c4cca80c6e3663efb3095b439b01063e0e128122
 2015-10-21 14:29:35 -04:00
Margaret Leibovic 234fd32eeb Bug 1216257 - Rename "Display" category to "Accessibility" r=sebastian 
--HG--
rename : mobile/android/base/resources/xml/preferences_display.xml => mobile/android/base/resources/xml/preferences_accessibility.xml
extra : commitid : CotJQcAlqN6
extra : rebase_source : ca8fb8c6c45dadf175fa483322637a5eb3f1026f
 2015-10-21 14:11:31 -04:00
Margaret Leibovic 4226c657b3 Bug 1216257 - Move "Search" category to top level r=sebastian 
--HG--
extra : commitid : FZYNXvhwc7C
extra : rebase_source : 0bfa19d370538ee565b29603f5d8f22838c4e741
 2015-10-21 12:07:51 -04:00
Margaret Leibovic 928ed9eec2 Bug 1216257 - Rename "Customize" category to "General" r=sebastian 
--HG--
rename : mobile/android/base/resources/xml-v11/preferences_customize.xml => mobile/android/base/resources/xml-v11/preferences_general.xml
rename : mobile/android/base/resources/xml-v11/preferences_customize_tablet.xml => mobile/android/base/resources/xml-v11/preferences_general_tablet.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml => mobile/android/base/resources/xml/preferences_general.xml
rename : mobile/android/base/resources/xml/preferences_customize_tablet.xml => mobile/android/base/resources/xml/preferences_general_tablet.xml
extra : commitid : 7p8QMvlBKb6
extra : rebase_source : f59ba82a5ec034c1c4cfe4ea718225bad9ccff80
 2015-10-21 10:57:15 -04:00