summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.4.4_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0Ricardo Cerqueira2014-06-201-0/+5
|\
| * Sanitize selector Intent when handling intent: scheme.Marcin Kosiba2014-06-171-0/+5
* | reduce cookie tracking (2/4): add a way to count cookiesRobin Humble2014-06-081-0/+5
* | Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-03107-506/+2288
|\|
| * Add missing Chromium LICENSE file.Ben Murdoch2014-04-081-0/+27
| * Revert "Support a prebuilt WebView."Torne (Richard Coles)2014-03-211-6/+2
| * Fix check when setLayerType is called in constructorBo Liu2014-03-181-1/+6
| * Plumb setLayerType to AwContentsBo Liu2014-03-141-2/+12
| * Update resources to match upstream.Marcin Kosiba2014-03-0317-26/+27
| * Import translations. DO NOT MERGEBaligh Uddin2014-02-191-1/+1
| * Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-131-1/+0
| * Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-071-0/+1
| * Merge scripts: duplicate arm makefile for arm64.Torne (Richard Coles)2014-01-301-0/+8
| * Don't strip ColorPicker resources referenced from XML.Ben Murdoch2014-01-241-0/+14
| * Remove @override to fix build breakSelim Gurun2014-01-231-1/+0
| * Add WebSettings API tracingMikhail Naganov2014-01-081-3/+43
| * Reland "automerger: download gn before generating makefiles."Richard Coles2014-01-021-0/+11
| * Merge master-chromium into m33 at r241094Torne (Richard Coles)2014-01-0215-11/+94
| |\
| | * Do not merge third_party/angle_dx11Bo Liu2013-12-161-1/+0
| | * Merge "Revert "Adding a fake on page started for data url's since we know it ...Martin Kosiba2013-12-161-10/+0
| | |\
| | | * Revert "Adding a fake on page started for data url's since we know it wont be...Martin Kosiba2013-12-121-10/+0
| | * | Add third_party/angle to merged project list.Torne (Richard Coles)2013-12-131-0/+1
| | * | Revert "Revert "Wire up resources for the Form Validation message bubble.""Ben Murdoch2013-12-1313-0/+93
| | * | Revert "Wire up resources for the Form Validation message bubble."Mikhail Naganov2013-12-1313-93/+0
| | * | Wire up resources for the Form Validation message bubble.Ben Murdoch2013-12-1213-0/+93
| | |/
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-301-1/+1
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-2655-1100/+550
| * | Import translations. DO NOT MERGEBaligh Uddin2013-12-1855-55/+1155
| * | Merge master-chromium into master at r240154Torne (Richard Coles)2013-12-1812-35/+201
| |\|
| | * Merge "Resources for "Support datalist for date/time input types on Android""...Bo Liu2013-12-115-2/+55
| | |\
| | | * Resources for "Support datalist for date/time input types on Android"Bo Liu2013-12-095-2/+55
| | * | Merge "Revert "automerger: download gn before generating makefiles."" into ma...Richard Coles2013-12-111-11/+0
| | |\ \ | | | |/ | | |/|
| | | * Revert "automerger: download gn before generating makefiles."Richard Coles2013-12-111-11/+0
| | * | Add resource after chromium crrev.com/r239076Bo Liu2013-12-054-0/+7
| | |/
| | * automerger: download gn before generating makefiles.Torne (Richard Coles)2013-12-051-0/+11
| | * Merge "Update resources needed for colour picker." into master-chromiumPrimiano Tucci2013-12-049-25/+124
| | |\
| | | * Update resources needed for colour picker.Primiano Tucci2013-12-039-25/+124
| | * | Enable webview printingSelim Gurun2013-12-021-7/+7
| | |/
| | * Merge "Allow CookieManager to be used without starting Chromium." into master...Torne (Richard Coles)2013-11-291-1/+8
| | |\
| | | * Allow CookieManager to be used without starting Chromium.Torne (Richard Coles)2013-11-271-1/+8
| * | | am 26ed03a2: (-s ours) DO NOT MERGE: Support a prebuilt WebView.Torne (Richard Coles)2013-12-100-0/+0
| |\ \ \
| | * | | DO NOT MERGE: Support a prebuilt WebView.Torne (Richard Coles)2013-12-091-2/+6
| * | | | am 52c771c9: (-s ours) DO NOT MERGE reset to goog/klp-volantis-devQiwen Zhao2013-12-100-0/+0
| |\| | |
| | * | | DO NOT MERGE reset to goog/klp-volantis-devQiwen Zhao2013-12-090-0/+0
| | |\ \ \
| * | | | | am 26c0eaa0: (-s ours) am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import t...Baligh Uddin2013-12-100-0/+0
| |\| | | |
| | * | | | am bc0f8d36: (-s ours) am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| | |\ \ \ \
| | | * \ \ \ am 5fc2b7c0: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-11-050-0/+0
| | | |\ \ \ \
| * | | | | | | am 8009977d: (-s ours) am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt W...Torne (Richard Coles)2013-12-100-0/+0
| |\| | | | | |
| | * | | | | | am 3ba0b9a1: am cf686f7a: Revert "Support a prebuilt WebView."Torne (Richard Coles)2013-10-301-6/+2
| | |\| | | | |
| | | * | | | | am cf686f7a: Revert "Support a prebuilt WebView."Torne (Richard Coles)2013-10-301-6/+2
| | | |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 01:10:48 +0000