summaryrefslogtreecommitdiff
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: I639b465daa7a1def5271b32ea35ac9a9a0acf10b
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: Ia3d0f40b6945e5c9f5063a1b329881a2a4de2bb2
2014-11-05Update makefiles after merge of Chromium at 5a645aa13b82Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I769ed4b8a29d8594f8ace4d8e7ba04c4e8779d4f
2014-11-05Update makefiles after merge of Chromium at 2d0da5605d75Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I758313ab8122cbc3f9031182eae5c57e2da48970
2014-11-04Update makefiles after merge of Chromium at a99b7ad25d02Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I50b9244bcce865fadd6a0df93c911cf163c9c40f
2014-10-31Update makefiles after merge of Chromium at a41c404b1c7fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iab045dbfc6590f7d3938e13fc868f4a6199639e3
2014-10-31Update makefiles after merge of Chromium at b210e2d62956Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ic4062ef4ab74da6c463721c47e3197b8812fa2ab
2014-10-28Update makefiles after merge of Chromium at 82ca3b654cdaAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9db31eab580a77442d38de1a64c9652e173b3862
2014-10-27Merge from Chromium at DEPS revision 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I09671863012e27f2489cfd46a2cc59b79bbe7fb7
2014-10-23Update makefiles after merge of Chromium at 9ef958e74e13Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I229dfecc40977b01b88476fefad044a136b0e0e9
2014-10-19Update makefiles after merge of Chromium at 89b463ddd92bAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9252b44f242eeb73b109253a8e989cde7db63ed0
2014-10-15Update makefiles after merge of Chromium at 6e9c84566c9fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I5525533957bab4ead01d43adfa13cdf4438950a0
2014-09-30Update makefiles after merge of Chromium at 9c6ac85c45faAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id75d54350c29bcd9bfec3228abac778ffd11b2e5
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: I0a8fcc549ea49204121e4e93738bdffcfbfeeefd
2014-09-22Update makefiles after merge of Chromium at fb34b348eeadAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib0295c91c15e61f31e7e34f8fbc97b1cbdf0c441
2014-09-13Update makefiles after merge of Chromium at 6a4d455b8650Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I08e162f2356523f4c657f3406deb3c4b01d9350d
2014-09-11Update makefiles after merge of Chromium at b62471bd5180Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I0507980f8080afbf61dc4360c18ed1128e857062
2014-09-10Update makefiles after merge of Chromium at a301aef21f9eAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ibc857eefd77cf71c5ab829bad394a1b6a94fc243
2014-09-10Update makefiles after merge of Chromium at d0b993bb2548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I21761e3ba5e85547179716cc3fe7b691418d64cd
2014-09-09Update makefiles after merge of Chromium at facf66e09bf8Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3207699a55bc2ee055d4a31aabd92f6bd70a3ab6
2014-09-09Update makefiles after merge of Chromium at 457b0a1c9412Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie1701f7ea4c871632674cfc284e1cf8973c3ab7c
2014-08-27Update makefiles after merge of Chromium at b241671f0248Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3a473c074834132b47e4ddb192082e73966a6f8c
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: I03d5bff02514aaadbaa4a6b80e40a50e84088c80
2014-08-12Merge from Chromium at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I923cbe0ba3860d88b6ab18e1aacfd145738fd6fb
2014-08-12Update makefiles after merge of Chromium at 288938Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I88d4741e7dbf3910f47da827c0bfb3d36aa8d365
2014-07-29Update makefiles after merge of Chromium at 286177Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I491cf3dbc684be9439bc004a44272160f8848527
2014-07-20Merge from Chromium at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I57b6756041ffdfd7c077fbcf3021216eaef0e7b1
2014-07-10Update makefiles after merge of Chromium at 282385Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: If0fcda12ccedb2f1eff49dee7360b02879daf119
2014-06-25Update makefiles after merge of Chromium at 279716Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I7dbbf5bd88422650cd0ab7ab0cf5574130b3a1bf
2014-06-25Merge from Chromium at DEPS revision 278856Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I91d21ab8ffe178d0aa9f8b6b5d5e8770e51a9574
2014-06-20Merge from Chromium at DEPS revision 278205Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I4f8394192c0b95db4af9f920d3fae7980a53d4ec
2014-06-19Update makefiles after merge of Chromium at 278252Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I243fa0a891270c1726b859862b1b43571196eefa
2014-06-16Update makefiles after merge of Chromium at 277428Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3187cbab152cab17a27a583158cb02b616bd3211
2014-06-10Update makefiles after merge of Chromium at 276202Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1cd22e1d6145cb6048baa4fefa1809f15d503fc9
2014-06-09Update makefiles after merge of Chromium at 275833Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3c33b116704c45e86519d863d16ba19d36508df1
2014-06-09Merge from Chromium at DEPS revision 275586Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id08012ea35fe65f33f286852506b240388f027f4
2014-06-07Update makefiles after merge of Chromium at 275661Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id7615ee9114cf880afa900f7f3fe6e40ed88139a
2014-06-03Update makefiles after merge of Chromium at 274467Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idbe78e8c2d85bf123dc5ba0ff8b909ad09f59832
2014-06-03Merge from Chromium at DEPS revision 273901Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I6d2528edf9fe3246f921ce5858813fa4bc3b997d
2014-05-28Update makefiles after merge of Chromium at 273259Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I31ef589bfc7198ea151adf1b24e3f46f4357b40f
2014-05-28Update makefiles after merge of Chromium at 273188Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I246fa6495d6a3edc174493b7cdeee1172b35c0a9
2014-05-24Update makefiles after merge of Chromium at 272740Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie7d5b75c85f35eb6c83281d5bebb5b9ed590b417
2014-05-23Update makefiles after merge of Chromium at 272566Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia33ce1e6c62f473a6757d90ffe5d5f7008e095f8
2014-05-17Update makefiles after merge of Chromium at 271215Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ieed7eba8054c911c9364db9566add72bd64c20e3
2014-05-16Update makefiles after merge of Chromium at 270770Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: I6ef68716be59dcb826e40419343a57ef5b7b3461
2014-05-15Merge from Chromium at DEPS revision 269467Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I44289eae0d6f96d69ea1bc0995713ccd6c89ca4f
2014-05-14Merge from Chromium at DEPS revision 269336Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia45aa9a671b471267a5e8ca43232e23b9c6dbc16
2014-05-14Update makefiles after merge of Chromium at 269467Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: I44c9bf3b064693963b928251073977622096d5f2