aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Merge "DO NOT MERGE - Merge RQ3A.210605.005"HEADandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-s-beta-5android-s-beta-4android-s-beta-3mastermainandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-s-beta-5android-s-beta-4Xin Li
2021-06-18DO NOT MERGE - Merge RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: Ie8d273abe071139b4f1469843a8b85ec833fddb6 Change-Id: I4a7812f7e5a7b56c04ab90b05eab4bd22b14c5d7
2021-06-17DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li
Bug: 190855093 Merged-In: I5c11c34ec441cfec7af2bb3bdd6e286d69b5130d Change-Id: Ie8d273abe071139b4f1469843a8b85ec833fddb6
2021-06-17DO NOT MERGE - Merge ab/7272582Xin Li
Bug: 190855093 Merged-In: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 Change-Id: I5c11c34ec441cfec7af2bb3bdd6e286d69b5130d
2021-03-06Snap for 7189773 from 5e0744b027d4d1250e6d205943ceacb66b78705e to ↵android-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot
rvc-qpr3-release Change-Id: I3b03b4092d1772030cf337edaf2ed67f05bd3280
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s ours am: ↵temp_ab_7272582Rubin Xu
e6b248a453 -s ours am: a3194f0def -s ours am: f6b0dd6722 -s ours am: b856655703 -s ours am: 5e0744b027 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9dbfb5471ff8ca00d36f1830124c56ff7fb036b6
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 204ba1d12f -s ours am: ↵Rubin Xu
a6bd8ce3f7 -s ours am: 234f76510a -s ours am: fc56693733 -s ours am: ec47c4aaa2 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 3e181ebbc4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580728 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1a49d06f7d30a218848dde8ec5f3ae34a01ccf83
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s ours am: ↵Rubin Xu
e6b248a453 -s ours am: a3194f0def -s ours am: f6b0dd6722 -s ours am: b856655703 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib2e6b48bc59c0d1dac6f75da6b9642abb6c0049d
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 204ba1d12f -s ours am: ↵Rubin Xu
a6bd8ce3f7 -s ours am: 234f76510a -s ours am: fc56693733 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 9295700ee7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580728 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icbb5c5592ccc86c36dfc9aa52802fc72d93c5027
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s ours am: ↵Rubin Xu
e6b248a453 -s ours am: a3194f0def -s ours am: f6b0dd6722 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc5d15fd727745ba0bfb6343789ef03f54defc3a
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 204ba1d12f -s ours am: ↵Rubin Xu
a6bd8ce3f7 -s ours am: 234f76510a -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 9295700ee7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580728 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id825221472ca5e03b2f9da7f6d3a0d6b9808e546
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s ours am: ↵Rubin Xu
e6b248a453 -s ours am: a3194f0def -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1d24e46e01f574a4cfb79d76612de0a07ff6718b
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 204ba1d12f -s ours am: ↵Rubin Xu
a6bd8ce3f7 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 9295700ee7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580728 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b382dcc6b6e4c2463ea764967f67234597328d8
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s ours am: ↵Rubin Xu
e6b248a453 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c00d054456b5c40be451b7a204220f4c2d7a65d
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 204ba1d12f -s oursRubin Xu
am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 9295700ee7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580728 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I49a706aa75bc040fb06b496ca5d89ed62092dab7
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 7fca112f30 -s oursRubin Xu
am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 204ba1d12f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13580729 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9adb4f5fdfaa578a17bd28171f0e686b2a132e2f
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9295700ee7 am: 5b182ededb ↵Rubin Xu
-s ours am: b237470fb9 -s ours am: 985d2e31f5 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 3e181ebbc4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13536906 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I468ae7b2dec4f2e0e2203f58bfcfba7246abd7d9
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9295700ee7 am: 5b182ededb ↵Rubin Xu
-s ours am: b237470fb9 -s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 438381db24 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13536906 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I69df4d5e51854c96f9b090d3cb09e1e778bad67b
2021-03-06[automerger skipped] Upgrade V8 to 8.8.278.14 am: 9295700ee7 am: 5b182ededb ↵Rubin Xu
-s ours am skip reason: Change-Id I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 with SHA-1 438381db24 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13536906 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc42d65ef5a682696c54dfe7dfddd96d675e101c
2021-03-05Upgrade V8 to 8.8.278.14 am: 9295700ee7Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13536906 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I398ed0a0b11c8da5fd5425b100530cfe268eee08
2021-03-05Upgrade V8 to 8.8.278.14 am: 438381db24 am: cb23f7219eRubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13605888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic1a798941bfda4cd273a86d790e1320c09cec4f0
2021-03-05Upgrade V8 to 8.8.278.14Rubin Xu
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Bug: 162604069 Bug: 167389063 Change-Id: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 (cherry picked from commit 438381db24b83e6fde76a4ca2c6a9fa91f822265)
2021-03-03Snap for 7183002 from cb23f7219e7eee3dabc10c7f4501440beb5a9430 to ↵android-build-team Robot
rvc-qpr3-release Change-Id: Ie581b8e8baebef12f7d61b3972dd8b06913efa53
2021-03-03Upgrade V8 to 8.8.278.14 am: 438381db24Rubin Xu
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13605888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic06faac67ab0957ff4f753452eeb82bb9a535970
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 214da93ac0 -s oursXin Li
am skip reason: Change-Id I31cb419d52b5d6279df05cc2df1ce71dabfb072a with SHA-1 f117db105e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc928bb211f4a0dfe7844224f5ebdad68ea6e3f4
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I31cb419d52b5d6279df05cc2df1ce71dabfb072a Change-Id: Id4306b7bd33d257752d7bd9a82b6f0d5b14ac6f7
2021-02-17Upgrade V8 to 8.8.278.14Rubin Xu
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Bug: 162604069 Bug: 167389063 Merged-In: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 Change-Id: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09
2021-02-17Upgrade V8 to 8.8.278.14Rubin Xu
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Bug: 162604069 Bug: 167389063 Change-Id: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-libpac" am: ↵Bob Badour
da8962e568 am: aa4447a2df Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1588881 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I572960b88456738e901abc592f56deef009d5da3
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-libpac" am: da8962e568Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1588881 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20172eaa7b3f5db8367b470cfec6cc842fb925a9
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-libpac"android-s-preview-1Bob Badour
2021-02-16Upgrade V8 to 8.8.278.14Rubin Xu
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Bug: 162604069 Bug: 167389063 Merged-In: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 Change-Id: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09
2021-02-16Upgrade V8 to 8.8.278.14Rubin Xu
Test: gts-tradefed run gts-dev --module GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest Test: m -j proxy_resolver_v8_unittest && adb sync && adb shell \ /data/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Bug: 162604069 Bug: 167389063 Merged-In: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09 Change-Id: I2b2e3d4f8fc99d160b228efb9b96ad6018453e09
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/chromium-libpacBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MPL to: Android.bp Added SPDX-license-identifier-BSD to: test/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I9ca1b442f15b9195e5d1943602f36a55e3d6dcf3
2020-11-24Mark ab/6881855 as merged am: 9afb51ed7eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/13112584 Change-Id: I31cb419d52b5d6279df05cc2df1ce71dabfb072a
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I75589669927a4e77826c531920515b081400787c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 30aa321ed1 -s ours am: ↵Xin Li
5187fcea9d -s ours am skip reason: Change-Id I1ce4a8d39cd1b8349250f155dfcabd8e1f8e5c3c with SHA-1 7f94156851 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/12795830 Change-Id: I915fd2ab4bf83c8df080eb8a8bf5759b66e0baa9
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 30aa321ed1 -s oursXin Li
am skip reason: Change-Id I1ce4a8d39cd1b8349250f155dfcabd8e1f8e5c3c with SHA-1 7f94156851 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/12795830 Change-Id: I44e3f8ef8c381736ca6d9dfcf2bed2d868de8f66
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I1ce4a8d39cd1b8349250f155dfcabd8e1f8e5c3c Change-Id: I15df652b2192c16ae33b23974a7d33be53d925db
2020-09-11[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s ours am: ↵Xin Li
0311635e85 -s ours am: 2d4d8df44a -s ours am: 05287750f5 -s ours am skip reason: Change-Id I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f with SHA-1 3045de1292 is in history Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1422304 Change-Id: I52fe051d0b2ea94d6cb753782cf9c2fd574ef9b8
2020-09-11[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s ours am: ↵Xin Li
0311635e85 -s ours am: 2d4d8df44a -s ours am skip reason: Change-Id I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f with SHA-1 3045de1292 is in history Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1422304 Change-Id: I3c8afafaa3df4fab31d9c8658aa99d518beec797
2020-09-11[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s ours am: ↵Xin Li
0311635e85 -s ours am skip reason: Change-Id I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f with SHA-1 3045de1292 is in history Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1422304 Change-Id: I09c18e9a8ff34257d28b2a9006370c1266b83fd9
2020-09-11[automerger skipped] Merge "Merge Android R" am: 81cfc612a8 -s oursXin Li
am skip reason: Change-Id I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f with SHA-1 3045de1292 is in history Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1422304 Change-Id: I09215b067e4a90ddb3202867fdff23908e875cc0
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f Change-Id: I5b3124625a3c393fc507a76366f463c3d9e711ab
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3045de1292 -s ours am: 0263d324d0 -s ours am: b8b0a2bcd6 -s ours am skip reason: Change-Id I727f2d7476b85df3c133cfed15cc2d4d381b69ff with SHA-1 b07fe0e7a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/12469401 Change-Id: I1e79a0cb837981768b2b7c73d9066a10d53f7f3b
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3045de1292 -s ours am: 0263d324d0 -s ours am skip reason: Change-Id I727f2d7476b85df3c133cfed15cc2d4d381b69ff with SHA-1 b07fe0e7a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/12469401 Change-Id: Idd6fcbdfc47934eec8c1f5ba6db25a15d22d5a8c
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 3045de1292 -s ours am skip reason: Change-Id I727f2d7476b85df3c133cfed15cc2d4d381b69ff with SHA-1 b07fe0e7a9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/chromium-libpac/+/12469401 Change-Id: I9c5d668f271c2ea4c63c274ef33254b0ce8637dc
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I727f2d7476b85df3c133cfed15cc2d4d381b69ff Change-Id: I4c367c09b9cbf00d8e1100130ad3d80c0cb2562f
2020-07-07[automerger skipped] Merge "Merge android10-qpr3-release to aosp-master - DO ↵Bill Yi
NOT MERGE" am: 9fba6d0933 am: 78cfe771a3 -s ours am: b07fe0e7a9 am: 7f94156851 Original change: https://android-review.googlesource.com/c/platform/external/chromium-libpac/+/1356140 Change-Id: Ie37970a9e3c8a0e35f5808e439e744141105c7c0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 18:01:13 +0000