summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.0_r26' into cm-13.0stable/cm-13.0-ZNH0ERicardo Cerqueira2015-11-055-4/+17
|\
| * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| |\
| | * merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-120-0/+0
| | |\
| * | | Import translations. DO NOT MERGEBaligh Uddin2015-09-186-5/+18
| * | | am 9ecaa9d5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\ \ \ | | |/ / | |/| |
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-07-113-5/+5
* | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-07-160-0/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| |\ \ | | |/ | |/|
| | * merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | |\ | | |/ | |/|
* / | Import translations. DO NOT MERGEGeoff Mendal2015-07-154-6/+6
|/ /
* / Increment kAwDrawGLInfoVersionChris Craik2015-06-121-1/+12
|/
* Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+13
* Remove no-longer-used webview glue sources.Torne (Richard Coles)2015-05-28121-8738/+2
* Merge "Return error code when failing to load webview relro file."Gustav Sennton2015-04-241-7/+28
|\
| * Return error code when failing to load webview relro file.Gustav Sennton2015-04-171-7/+28
* | Merge "Revert "Revert "GraphicsJNI update"""John Reck2015-04-222-1/+7
|\ \
| * | Revert "Revert "GraphicsJNI update""John Reck2015-04-222-1/+7
* | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-04-223-0/+33
|\ \ \
| * | | Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+33
| |/ /
* / / Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+39
|/ /
* | [Android WebView] Delete WebViewShell.Tim Volodine2015-04-2010-372/+0
* | Revert "GraphicsJNI update"John Reck2015-04-172-7/+1
|/
* GraphicsJNI updateJohn Reck2015-04-142-1/+7
* Merge "Removing jank tests from frameworks/webview."Allen Hair2015-04-078-462/+0
|\
| * Removing jank tests from frameworks/webview.Allen Hair2015-03-308-462/+0
* | Import translations. DO NOT MERGEGeoff Mendal2015-04-031-1/+1
|/
* Merge "Add WebViewBrowserActivity and cleanup to WebViewShell."Tim Volodine2015-03-243-13/+72
|\
| * Add WebViewBrowserActivity and cleanup to WebViewShell.Tim Volodine2015-03-233-13/+72
* | Merge "Import translations. DO NOT MERGE"Geoff Mendal2015-03-211-0/+11
|\ \
| * | Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+11
* | | Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+13
|/ /
* | am aeafafb7: Merge changes landed in master after lmp-dev creation.Torne (Richard Coles)2015-03-200-0/+0
|\ \ | |/ |/|
| * Merge changes landed in master after lmp-dev creation.Torne (Richard Coles)2014-07-025-0/+445
| |\
* | | Update WebViewFlingTest to use new janktesthelper annotation format.Allen Hair2015-03-091-2/+3
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-211-2/+2
* | | Import translations. DO NOT MERGEGeoff Mendal2015-01-051-2/+2
* | | Import translations. DO NOT MERGEBaligh Uddin2014-12-221-2/+2
* | | Stop building the webview APK from source.Torne (Richard Coles)2014-12-081-7/+0
* | | Update glue layer from master-chromium.Torne (Richard Coles)2014-12-0310-64/+329
|\ \ \
| * \ \ Merge "Fork draw_gl.h/draw_sw.h." into master-chromiumMarcin Kosiba2014-11-266-5/+186
| |\ \ \
| | * | | Fork draw_gl.h/draw_sw.h.Marcin Kosiba2014-11-256-5/+186
| * | | | Wrap all of the WebView ContextsMarcin Kosiba2014-11-244-59/+143
| |/ / /
* | | | Update master from master-chromium at ca22ae4.Torne (Richard Coles)2014-11-185-243/+49
|\| | |
| * | | Remove DRP manager codeSelim Gurun2014-11-182-206/+0
| * | | Merge "Fix reflection for detecting fullscreen API support." into master-chro...Ben Murdoch2014-11-181-12/+20
| |\ \ \
| | * | | Fix reflection for detecting fullscreen API support.Ben Murdoch2014-11-181-12/+20
| * | | | Fix WebView targetSDK checks.Ben Murdoch2014-11-182-6/+15
| |/ / /
| * | | Update WebViewFlingTest to use new UiAutomator API.Allen Hair2014-11-181-19/+14
| * | | Update master-chromium.Torne (Richard Coles)2014-11-1844-5/+686
| |\ \ \ | |/ / / |/| | |
* | | | Update to latest master-chromium.Torne (Richard Coles)2014-11-184-11/+5
|\| | |