aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-27Merge WebView M40 build 1832189 into AOSP.HEADandroid-m-preview-2android-m-preview-1mastermainTorne (Richard Coles)
2014-12-05Merge "Temporarily disable -Werror in Chromium."android-m-previewmaster-soongTorne (Richard Coles)
2014-12-05Temporarily disable -Werror in Chromium.Torne (Richard Coles)
Temporarily disable the use of -Werror in the AOSP copy of Chromium so that the system-wide default warnings can be changed without breaking Chromium. We'll re-enable it once the warnings are settled and we've fixed any issues. Bug: 18632512 Change-Id: I97dce9f3178888b2901f1cda7ce818cdf4295198
2014-11-06Merge from Chromium at DEPS revision db3f05efe0f9webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-releaseTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I1a534252273be8f4130c79debe1cac10b1e8d19f
2014-11-05Update makefiles after merge of Chromium at 5a645aa13b82Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie60844c92351b08f08df1bfababef624d67e9b19
2014-11-05Update makefiles after merge of Chromium at 2d0da5605d75Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2c6a2e16a048351e410f6d535cbb7ae6964deeef
2014-11-04Update makefiles after merge of Chromium at a99b7ad25d02Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1e927b1abe13071f0845450c9206b18041f145a2
2014-10-31Update makefiles after merge of Chromium at a41c404b1c7fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idb352bee83b58e793dbe41c41ad5c1c21d8fd999
2014-10-31Update makefiles after merge of Chromium at b210e2d62956Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I45f3a2e68f9aba8345109bced72ed8e718cb61e5
2014-10-28Update makefiles after merge of Chromium at 82ca3b654cdaAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I164360f1eea98e19e7ea30ae5a1a43a97641a61a
2014-10-27Merge from Chromium at DEPS revision 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Iecebd219485e5db16bcd3ceccad2982e5c4280f1
2014-10-23Update makefiles after merge of Chromium at 9ef958e74e13Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8d97bddd35e54b452d282c77cccccf47e50b4b6d
2014-10-19Update makefiles after merge of Chromium at 89b463ddd92bAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I0e16bd2fb851b4625fa442aa93c58af95f334465
2014-10-15Update makefiles after merge of Chromium at 6e9c84566c9fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I428ef84cb5b38e50b9ad568dac26bff9874793fc
2014-09-30Update makefiles after merge of Chromium at 9c6ac85c45faAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I12521ae3b1f9427592f313bb08d99a4e1c0578c4
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: Ie792d0b51f6c9fb5db8718259ebee6ebc9ced812
2014-09-22Update makefiles after merge of Chromium at fb34b348eeadAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4474e5cfe82a391ede97f98cd8af81e12a76cba3
2014-09-13Update makefiles after merge of Chromium at 6a4d455b8650Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I536a12d95da784b7c28e915cd7830a42f45334f9
2014-09-11Update makefiles after merge of Chromium at b62471bd5180Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I34739eb041976d8d3e0bc2579531109faa1e5ee6
2014-09-10Update makefiles after merge of Chromium at a301aef21f9eAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia41864c91b267f29feebc3cfe29eec29673c99e5
2014-09-10Update makefiles after merge of Chromium at d0b993bb2548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I04085ab6ad987ab02e6b7d54c4806358a229a625
2014-09-09Update makefiles after merge of Chromium at facf66e09bf8Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iac640a9f0425376b027703fae33afa860e059d45
2014-09-09Update makefiles after merge of Chromium at 457b0a1c9412Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I680f46e46dd624ff41c4233a942c21b2aa751c92
2014-08-27Update makefiles after merge of Chromium at b241671f0248Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ibf139c6f0ca023537cf1ef8c1b5418564da06ddc
2014-08-19Merge from Chromium at DEPS revision 290040android-wear-5.1.1_r1android-wear-5.1.0_r1Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Idb5ee06ccec05b1a4a65ac9f612ec940887cefff
2014-08-12Merge from Chromium at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia77a364668c08759816cc3fd33e8e0fdf6e68907
2014-08-12Update makefiles after merge of Chromium at 288938Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib8f140c6d7937f64e1054602df18c927c79d04dd
2014-07-29Update makefiles after merge of Chromium at 286177Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I370993307855184329c849bf17b7fbb644b0a30c
2014-07-20Merge from Chromium at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I5774336fe7d1c24768a71ade669cc8c39af8b02c
2014-07-10Update makefiles after merge of Chromium at 282385Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id1f5f74c0daca27c9856f6d3ffb1e0543083237f
2014-07-01Update makefiles after merge of Chromium at 280798Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4e0521ac15eff30eee9685ce695640c93e96a764
2014-07-01Merge third_party/ots from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/ots.git at 98897009f3ea8a5fa3e20a4a74977da7aaa8e61a This commit was generated by merge_from_chromium.py. Change-Id: Ib41229bd8fa71b7a56338c5b04902753525aeac5
2014-07-01Update makefiles after merge of Chromium at 280795Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I745a11796f52b04490f1f6aab7dcf7e9509b5235
2014-07-01Update makefiles after merge of Chromium at 280794Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I6d2582bce6bd0cb45cd5badd51890a6bb2dc92a1
2014-07-01Merge third_party/ots from ↵Android Chromium Automerger
https://chromium.googlesource.com/external/ots.git at 98897009f3ea8a5fa3e20a4a74977da7aaa8e61a This commit was generated by merge_from_chromium.py. Change-Id: Ifdf472ec2fcf02fd1b3cae2d12b7e88b799954c5
2014-06-29Add BUILD.gnbashi@chromium.org
TBR=ksakamoto@chromium,org, brett@chromium.org Review URL: https://codereview.chromium.org/341393006 git-svn-id: http://ots.googlecode.com/svn/trunk@115 a4e77c2c-9104-11de-800e-5b313e0d2bf3
2014-06-27Add DoNotDropColorBitmapTables() API.bashi@chromium.org
Adding a API not to drop CBDT/CBLC tables. OTS doesn't recognize the tables for now, but trusts users of this API, assuming users exactly know the risks. BUG=324187 R=ksakamoto@chromium.org Review URL: https://codereview.chromium.org/341983012 git-svn-id: http://ots.googlecode.com/svn/trunk@114 a4e77c2c-9104-11de-800e-5b313e0d2bf3
2014-06-25Update makefiles after merge of Chromium at 279716Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I878af00525fd2b08235a57c59454dd44cab6903d
2014-06-25Merge from Chromium at DEPS revision 278856Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ifc338f5b8888c5aa5679442334c2fb0e87a12a83
2014-06-20Merge from Chromium at DEPS revision 278205Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I0eb93fb3da6da14bc2a8aff183402802a2f5aff3
2014-06-19Update makefiles after merge of Chromium at 278252Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3ae4606997ac1de6ee3c11a86355ea0809a1f1fe
2014-06-16Update makefiles after merge of Chromium at 277428Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9fc6dd2196dab1c98683554d2cb7c97e4aa35260
2014-06-10Update makefiles after merge of Chromium at 276202Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8870bd93ab78bbd3046681b5f494800ae94c9ab4
2014-06-09Update makefiles after merge of Chromium at 275833Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ieba4046d89804dff98abe0306d4ed0b6845ba57b
2014-06-09Merge from Chromium at DEPS revision 275586Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I35ec4940a1090876da6cd25f89d7d54c0eb18ff7
2014-06-07Update makefiles after merge of Chromium at 275661Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icde89d3e546b64272550a805ec5793aeff96bcf5
2014-06-03Update makefiles after merge of Chromium at 274467Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ic81b70b81b080736a4cdb72839271012db75dfa5
2014-06-03Merge from Chromium at DEPS revision 273901Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia77ba5c5cdd1a4a70ceff01e1d93d607396fe9b1
2014-05-28Update makefiles after merge of Chromium at 273259Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I27d8f4a638f5c2ce5cc004c284e92dcba82aa448
2014-05-28Update makefiles after merge of Chromium at 273188Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie8a4f60f2ee14a65a24636131171afea22b0ab24
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 16:59:45 +0000