summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'android-4.2_r1' into mr1-stagingRicardo Cerqueira2012-11-1981-1158/+768
|\
| * am 6c96757f: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-10-170-0/+0
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2012-10-162-7/+7
| |/
| * Let's enhanceJason Chen2012-10-154-0/+0
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-041-1/+1
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-031-1/+1
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-272-11/+11
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-262-8/+8
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-2521-42/+21
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-2427-55/+28
| * Import translations. DO NOT MERGEBaligh Uddin2012-09-2249-26/+123
| * Merge "Add contentDescription to SnapshotBar" into jb-mr1-devJohn Reck2012-09-212-8/+9
| |\
| | * Add contentDescription to SnapshotBarJohn Reck2012-09-212-8/+9
| * | Merge "Add contentDescription for page info" into jb-mr1-devJohn Reck2012-09-211-0/+1
| |\ \
| | * | Add contentDescription for page infoJohn Reck2012-09-211-0/+1
| | |/
| * | Merge "Add missing contentDescription" into jb-mr1-devJohn Reck2012-09-211-0/+1
| |\ \
| | * | Add missing contentDescriptionJohn Reck2012-09-211-0/+1
| | |/
| * | Add content description for folder upJohn Reck2012-09-212-0/+4
| |/
| * am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"John Reck2012-09-181-0/+1
| |\
| | * Merge "Don't replace file extension when mime-type is incorrect"John Reck2012-09-181-0/+1
| | |\
| | | * Don't replace file extension when mime-type is incorrectMagnus Hallqvist2012-09-141-0/+1
| | |/
| * | am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"John Reck2012-09-131-2/+2
| |\ \ | | |/
| | * Merge "BrowserSettings required a Controller sometimes"John Reck2012-09-131-2/+2
| | |\
| | | * BrowserSettings required a Controller sometimesMagnus Hallqvist2012-09-131-2/+2
| | |/
| * | Deleted code that relies on defunct SearchBox interface.Selim Gurun2012-09-111-70/+2
| * | am d22af61d: Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
| |\ \ | | |/
| | * Merge "Added catch of SQLiteException when updating screenshot"John Reck2012-09-061-0/+5
| | |\
| | | * Added catch of SQLiteException when updating screenshotMattias Nilsson2012-09-061-0/+5
| | |/
| * | am 1fce2b5d: Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
| |\ \ | | |/
| | * Merge "Reset to default did not reset cached settings"John Reck2012-09-051-0/+5
| | |\
| | | * Reset to default did not reset cached settingsBjörn Isaksson2012-09-051-0/+5
| | |/
| * | Merge "Use a fixed title bar if accessibility is enabled" into jb-mr1-devJohn Reck2012-09-042-0/+9
| |\ \
| | * | Use a fixed title bar if accessibility is enabledJohn Reck2012-09-042-0/+9
| * | | am 922afab3: Merge "No search pane while tapping search button after backing ...John Reck2012-09-041-0/+11
| |\ \ \ | | | |/ | | |/|
| | * | Merge "No search pane while tapping search button after backing to "windows" ...John Reck2012-09-041-0/+11
| | |\ \
| | | * | No search pane while tapping search button after backing to "windows" view fr...yijunx.zhu2012-08-211-0/+11
| * | | | am cf00c263: Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Pause WebView timer when Browser is paused"John Reck2012-09-041-5/+4
| | |\ \ \
| | | * | | Pause WebView timer when Browser is pausedMattias Falk2012-09-031-5/+4
| * | | | | resolved conflicts for merge of 0570344a to jb-mr1-devJean-Baptiste Queru2012-09-041-7/+10
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Merge "Pass webview's useragent when downloading via context menu"Jean-Baptiste Queru2012-09-041-7/+10
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Pass webview's useragent when downloading via context menuAndreas Sandblad2012-09-031-7/+10
| | |/ /
| * | | Merge "Pass referer on download requests" into jb-mr1-devSelim Gurun2012-08-295-18/+21
| |\ \ \
| | * | | Pass referer on download requestsSelim Gurun2012-08-295-18/+21
| * | | | am 3d2e213c: Merge "Fix the issue the SQL request built by QuickSearchBox is ...Jean-Baptiste Queru2012-08-282-2/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge "Fix the issue the SQL request built by QuickSearchBox is not handled p...Jean-Baptiste Queru2012-08-282-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Fix the issue the SQL request built by QuickSearchBox is not handled properly...Jean-Christophe PINCE2012-08-102-2/+2
| * | | am d9001a7d: Merge "NPE in WallpaperHandler"Jean-Baptiste Queru2012-08-141-1/+6
| |\ \ \ | | |/ /
| | * | Merge "NPE in WallpaperHandler"Jean-Baptiste Queru2012-08-141-1/+6
| | |\ \
| | | * | NPE in WallpaperHandlerNils Holmström2012-08-141-1/+6
| | | |/