summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | * | | | | | Always add the path to the WebView assets.Ben Murdoch2014-10-281-0/+3
| | | | | | |/ / / / /
| | | | | | * | | | | Merge "Remove DRP manager code" into m39Selim Gurun2014-10-242-181/+0
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Remove DRP manager codeSelim Gurun2014-10-242-181/+0
| | | | | | * | | | | | Fix reflection for detecting fullscreen API support.Ben Murdoch2014-10-241-12/+20
| | | | | | |/ / / / /
| | | | | | * | | | | Merge glue layer from master.Torne (Richard Coles)2014-10-1458-15/+750
| | | | | | |\ \ \ \ \
| | | | | | * | | | | | Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba2014-10-131-2/+0
| | | | | * | | | | | | am 9ee9488a: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-10-310-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|/ / / / | | | | | | |/| | | | |
| | | | | | * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-10-3072-57/+222
| | | | | * | | | | | | am 4bb8eed6: Revert "Wrap one more Context"Torne (Richard Coles)2014-10-291-2/+1
| | | | | |\| | | | | |
| | | | | | * | | | | | Revert "Wrap one more Context"Torne (Richard Coles)2014-10-291-2/+1
| | | | | * | | | | | | am 3180c1cc: resolved conflicts for merge of 5a706141 to stage-aosp-masterTorne (Richard Coles)2014-10-291-1/+2
| | | | | |\| | | | | |
| | | | | | * | | | | | resolved conflicts for merge of 5a706141 to stage-aosp-masterTorne (Richard Coles)2014-10-291-1/+2
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge "Merge chromium-dev up to 7d62eab"Torne (Richard Coles)2014-10-273-4/+2
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | Merge chromium-dev up to 7d62eabTorne (Richard Coles)2014-10-273-4/+2
| | | | | | | |/| | | | | |
| | | | | | | | * | | | | | Merge "Remove the default text encoding resource." into chromium-devMarcin Kosiba2014-10-102-3/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * | | | | | Remove the default text encoding resource.Marcin Kosiba2014-10-102-3/+0
| | | | | | | | |/ / / / / /
| | | | | | | | * | | | | | Merge "Wrap one more Context" into chromium-devMarcin Kosiba2014-09-291-1/+2
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * | | | | | Wrap one more ContextHector Dearman2014-09-291-1/+2
| | | | | | | | |/ / / / / /
| | | | | | | | * | | | | | Merge "Wrap all of the WebView Contexts" into chromium-devMarcin Kosiba2014-09-253-52/+128
| | | | | | | | |\ \ \ \ \ \
| | | | | * | | | | | | | | | am a837930e: am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncod...Marcin Kosiba2014-10-270-0/+0
| | | | | |\| | | | | | | | |
| | | | | | * | | | | | | | | am 53dc1aa9: Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba2014-10-131-2/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|/ | | | | | | | |/| | | | | | |
| | | | | | | * | | | | | | | Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba2014-10-101-2/+0
| | | | | * | | | | | | | | | am b762bbe6: am 0c6c259a: Merge "Use overridden resources." into lmp-devBen Murdoch2014-10-271-0/+2
| | | | | |\| | | | | | | | |
| | | | | | * | | | | | | | | am 0c6c259a: Merge "Use overridden resources." into lmp-devBen Murdoch2014-10-061-0/+2
| | | | | | |\| | | | | | | |
| | | | | | | * | | | | | | | Merge "Use overridden resources." into lmp-devBen Murdoch2014-10-061-0/+2
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | Use overridden resources.Ben Murdoch2014-10-061-0/+2
| | | | | * | | | | | | | | | | Match removal of config_webSettingsDefaultTextEncoding.Marcin Kosiba2014-10-131-2/+0
| | | | | * | | | | | | | | | | Reset the state of lmp-mr1-dev-plus-aosp to match lmp-dev-plus-aospPrimiano Tucci2014-10-0312-206/+26
| | | | | |\| | | | | | | | | |
| | | | | | * | | | | | | | | | am f6966000: Webview: Remove dexpreopt flagAndreas Gampe2014-10-021-3/+0
| | | | | | |\| | | | | | | | |
| | | | | | | * | | | | | | | | Webview: Remove dexpreopt flagAndreas Gampe2014-10-021-3/+0
| | | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | | resolved conflicts for merge of 5cdf0214 to lmp-dev-plus-aospPrimiano Tucci2014-10-020-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / | | | | | | | |/| | | | | | |
| | | | | | | * | | | | | | | Merge "Merge chromium-dev @ a1b0248 into aosp/master."Primiano Tucci2014-10-025-56/+132
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | Merge chromium-dev @ a1b0248 into aosp/master.Primiano Tucci2014-10-025-56/+132
| | | | | | | |/| | | | | | | | | | | | | | | | | |_|/ / / / / | | | | | | | | |/| | | | | |
| | | | | | * | | | | | | | | Merge -s ours (skip) commit a1b0248 into lmp-dev-plus-aospPrimiano Tucci2014-10-020-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / | | | | | | | |/| | | | | | |
| | | | | | | * | | | | | | | Wrap all of the WebView ContextsHector Dearman2014-09-253-52/+128
| | | | | | | | |_|/ / / / / | | | | | | | |/| | | | | |
| | | | | | * | | | | | | | Merge commit 60e4952d into lmp-dev-plus-aospPrimiano Tucci2014-10-021-1/+1
| | | | | | |\| | | | | | |
| | | | | | | * | | | | | | Merge "WebViewChromiumFactoryProvider should import ResourceExtractor fromorg...Bart Sears2014-09-121-1/+1
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromi...Vivek Galatage2014-09-111-1/+1
| | | | | | | |/ / / / / / /
| | | | | | * | | | | | | | Merge commit 8dc9a9d1 into lmp-dev-plus-aospPrimiano Tucci2014-10-023-3/+3
| | | | | | |\| | | | | | |
| | | | | | | * | | | | | | Merge "Update some content classes to content_public" into chromium-devBart Sears2014-09-043-3/+3
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | Update some content classes to content_publicBo Liu2014-09-033-3/+3
| | | | | | | |/ / / / / / /
| | | | | | * | | | | | | | Merge -s ours (skip) commit 04cc2fa into lmp-dev-plus-aospPrimiano Tucci2014-10-020-0/+0
| | | | | | |\| | | | | | |
| | | | | | | * | | | | | | Merge "Don't declare WebView as a library." into chromium-devMarcin Kosiba2014-09-013-3/+1
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | Don't declare WebView as a library.Torne (Richard Coles)2014-09-013-3/+1
| | | | | | | |/ / / / / / /
| | | | | | * | | | | | | | am b20977d3: Remove WebView DRP Setting from Developer SettingsHui Shu2014-10-012-210/+0
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |_|/ / / / / | | | | | | | |/| | | | | |
| | | | | | | * | | | | | | Remove WebView DRP Setting from Developer SettingsHui Shu2014-10-012-210/+0
| | | | | | * | | | | | | | am 8192f716: Merge "Suport initializing DRP from cmd line switches." into lmp...Hui Shu2014-09-261-5/+34
| | | | | | |\| | | | | | |
| | | | | | | * | | | | | | Merge "Suport initializing DRP from cmd line switches." into lmp-devHui Shu2014-09-261-5/+34
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * | | | | | | Suport initializing DRP from cmd line switches.Hui Shu2014-09-251-5/+34
| | | | | | * | | | | | | | | am 85e03c0a: WebView does not require a touch screen.Ben Murdoch2014-09-251-0/+4
| | | | | | |\| | | | | | | |