OSDN Git Service

merge from open-source master
[android-x86/packages-apps-Browser.git] / src / com / android / browser / WebsiteSettingsActivity.java
2010-05-04 The Android Open... merge from open-source master
2010-04-29 Jean-Baptiste QueruMerge "Fixed FindBugs warnings in BrowserBackupAgent...
2010-04-29 Jean-Baptiste QueruMerge "Optimized Maps usage by adding explicit types...
2010-04-27 Henrik BaardOptimized Maps usage by adding explicit types and impro...
2010-02-05 The Android Open... am 9df17a63: am 066e5308: reconcile main tree with...
2010-01-28 Mike Reedam 5b739d81: (-s ours) am 3d3c1985: disable mr stretchy...
2010-01-26 Mike Reedam 8fa17c4f: (-s ours) am 79f107bd: Do not merge
2010-01-26 Mike Reedam 15eb5b56: (-s ours) am 474429d0: Do not merge
2010-01-12 The Android Open... android-2.1_r1 snapshot
2009-12-15 Android Git AutomergerMerge commit 'goog/eclair-plus-aosp'
2009-12-11 Eric Fischeram 9c1d7d01: (-s ours) Import revised translations...
2009-12-02 Eric Fischeram 1852d75b: (-s ours) Import revised translations...
2009-12-02 Eric Fischeram 8f461425: (-s ours) Import revised translations...
2009-11-25 Ben Murdocham c44c7a6b: (-s ours) Rename addConsoleMessage to...
2009-11-25 Steve Blockam 164657ef: (-s ours) Adds an explicit type for Geoloc...
2009-11-25 Steve Blockam 164657ef: Adds an explicit type for GeolocationPermi...
2009-11-24 Steve BlockAdds an explicit type for GeolocationPermissions.getOri...
2009-11-20 Steve Blockam 7ef8c876: am 2a6a0f47: Adds an explicit type for...
2009-11-19 Steve Blockam 2a6a0f47: Adds an explicit type for GeolocationPermi...
2009-11-19 Steve BlockAdds an explicit type for GeolocationPermissions.getOri...
2009-11-15 Jean-Baptiste Querumerge from open-source master
2009-11-15 Jean-Baptiste Querumerge from eclair
2009-11-14 Eric Fischeram 64278482: (-s ours) Import revised translations...
2009-11-13 Eric Fischeram 80529427: (-s ours) Import revised translations...
2009-11-13 Jean-Baptiste Querueclair snapshot
2009-11-11 Ben Murdocham 66a7091f: am be9560db: Tidy up the website settings...
2009-11-11 Ben Murdocham be9560db: Tidy up the website settings activity...
2009-11-11 Ben MurdochTidy up the website settings activity. This is mostly...
2009-10-30 Eric Fischeram 6d0860d6: (-s ours) Import revised translations...
2009-10-27 Ben Murdocham 4abbaab3: am 9e19e44f: Remove the "clear all" menu...
2009-10-27 Ben Murdocham 9e19e44f: Remove the "clear all" menu option when...
2009-10-26 Ben MurdochRemove the "clear all" menu option when you are in...
2009-10-08 Eric Fischeram 999477f9: (-s ours) Import revised translations...
2009-10-08 Eric Fischeram d9f2cf37: (-s ours) Import revised translations...
2009-10-01 Nicolas Roardam 79d3eb5f: am 4df3c35c: Merge change Ie3890f91 into...
2009-10-01 Nicolas Roardam f1e80834: am 9725fac3: Merge change I9cdaba5e into...
2009-09-30 Android (Google... Merge change I3c58dbaa into eclair
2009-09-30 Nicolas Roardam 4df3c35c: Merge change Ie3890f91 into eclair
2009-09-30 Android (Google... Merge change Ie3890f91 into eclair
2009-09-30 Nicolas RoardFixes
2009-09-30 Nicolas Roardam 9725fac3: Merge change I9cdaba5e into eclair
2009-09-30 Android (Google... Merge change I9cdaba5e into eclair
2009-09-30 Nicolas RoardNew assets for settings
2009-09-28 Nicolas Roardam 55a00517: am 88fa35e4: Merge change 27451 into eclair
2009-09-28 Nicolas Roardam 88fa35e4: Merge change 27451 into eclair
2009-09-28 Android (Google... Merge change 27451 into eclair
2009-09-28 Nicolas RoardFix for the dual notification problem
2009-09-22 Nicolas Roardam 4671abb1: am e08dbd1e: Merge change 26219 into eclair
2009-09-22 Nicolas Roardam e08dbd1e: Merge change 26219 into eclair
2009-09-22 Android (Google... Merge change 26219 into eclair
2009-09-22 Nicolas RoardReimplement the settings to use async callbacks
2009-09-18 Android (Google... Merge change 25749 into eclair
2009-09-17 Nicolas Roardam f2aeaa16: am d95fb211: Fix warning
2009-09-17 Android (Google... Merge change 25402 into eclair
2009-09-17 Nicolas Roardam d95fb211: Fix warning
2009-09-17 Nicolas RoardFix warning
2009-09-17 Nicolas Roardam eead548b: am 11d2375b: Merge change 24908 into eclair
2009-09-17 Ben Murdocham 376ac458: am b9daacb7: Add an options menu to the...
2009-09-14 Nicolas Roardam 11d2375b: Merge change 24908 into eclair
2009-09-14 Android (Google... Merge change 24908 into eclair
2009-09-14 Nicolas RoardShow icons for storage and geolocation
2009-09-14 Ben Murdocham b9daacb7: Add an options menu to the web site settin...
2009-09-14 Ben MurdochAdd an options menu to the web site settings activity...
2009-09-10 Android (Google... Merge change 24566 into eclair
2009-09-10 Steve Blockam cf3d2b7f: am 44f1b387: Merge change 24521 into eclair
2009-09-10 Steve Blockam 44f1b387: Merge change 24521 into eclair
2009-09-10 Android (Google... Merge change 24521 into eclair
2009-09-10 Steve BlockRounds up to the nearest 0.1MB when displaying the...
2009-09-04 Jean-Baptiste Querumerge from open-source master
2009-08-27 Grace Klobaam b8a9cb0e: Fix the activity leak in the Browser.
2009-08-18 Eric Fischeram 9f0d27c8: (-s ours) Import revised translations...
2009-08-18 Grace Klobaresolved conflicts for merge of 918e1d78 to eclair
2009-08-12 Ramanan RajeswaranMerge commit '60c8c06e' into manualmerge
2009-08-06 Steve BlockFix for bug 2024912. Sets title in browser Website...
2009-08-04 Jean-Baptiste Querumerge from open-source master
2009-08-03 Eric Fischeram 9f53534e: (-s ours) Import revised translations...
2009-08-03 Grace Klobaresolved conflicts for merge of a34f6861 to master
2009-07-30 Android (Google... Merge change 8873
2009-07-30 Steve BlockAdds browser settings menu entries for Geolocation...
2009-07-30 Android (Google... Merge change 8986
2009-07-30 Android Git Automergerresolved conflicts for merge of cc634036 to master
2009-07-29 Steve BlockGeneralizes WebsiteSettingsActivity to handle more...
2009-07-29 Android (Google... Merge change 8853
2009-07-28 Steve BlockFixes bug 2018090 in browser Website Settings.
2009-07-28 Steve BlockImproves appearance of website URLs in browser 'Website...
2009-07-27 Leon Scrogginsam 04b2e8e1: Use the old string for bookmarks permissions.
2009-07-26 Jean-Baptiste Querureconcile korg/master into goog/master
2009-07-22 Dianne Hackbornam 57b461b6: Stop using old density APIs.
2009-07-22 Android (Google... Merge change 8027
2009-07-21 Patrick Scottam a0b0e2a2: (-s ours) Do not merge When opening a...
2009-07-21 Leon Scrogginsam 55581a65: (-s ours) DO NOT MERGE: Remove deprecated...
2009-07-21 Andrei Popescuwire appcache to HTML5 UI
2009-07-20 Grace Klobaam 83f47346: Fix 1984809. Select the url when SEARCH...
2009-07-15 Patrick Scottam e8dc977d: (-s ours) Do not merge.
2009-07-15 Jean-Baptiste QueruMerge commit 'goog/readonly-korg-master' into merge_kor...
2009-07-13 Eric Fischeram 8e5d209b: Import new translations
2009-07-13 Android (Google... am bae196df: Merge change 6811 into donut
2009-07-13 Bjorn Bringertam 1e8f0583: Move Browser search description to bookmar...
2009-07-10 Satish Sampatham 60d24e21: Make suggestion text color change based...
2009-07-10 Grace Klobaam cf849950: Fix 1970279. Like "Go", search key should...
next