aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-23Snap for 5401728 from f6a7e0f4f499953a1efc07967a51b6cfd1eab16c to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-mainline-10.0.0_r3android-mainline-10.0.0_r2android-mainline-10.0.0_r1android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-releaseandroid10-mainline-releaseandroid10-mainline-a-releaseandroid-build-team Robot
Change-Id: Ib16579f97b51fd108bdb6a50d7e6272869a3f34a
2019-03-21[automerger skipped] [automerger] Fix type confusion in libpac am: ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-devandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBryan Ferris
cad793346e am: dfd6a6fa5c am: 67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a am: 8d9a3d2ea5 am: 402344d63e am: 4e476c5d7a -s ours am skip reason: change_id I2e02d994f107e64e4f465b4d8a02d4159a95240e with SHA1 2894c6aa01 is in history Change-Id: I968d58fe81a99421692894bdf0a66ce97fabd817
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a am: 8d9a3d2ea5 am: 402344d63e Change-Id: I191dae410c3fa4a93d978cbe71c89465d87408c3
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a am: 8d9a3d2ea5 Change-Id: Ic0a9a4c3821951c2cffd59b401c3a3da40f335de
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 am: 10c2d8b54a Change-Id: Ie293171d315c18cd325ebce76c21fc3e2d59df09
2019-03-21[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Bryan Ferris
67c9400dce am: 8ae53d498d am: 358bd5333d am: ac82097329 Change-Id: I94d6722dcb51a8065d92a547563073f5deb91bac
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Android Build Merger (Role)
67c9400dce am: 8ae53d498d am: 358bd5333d Change-Id: Ib152eb3974d2ae4fc24c08e8223e03301ae00761
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Android Build Merger (Role)
67c9400dce am: 8ae53d498d Change-Id: I9afeb65c4d03dfe98863f36e8cc1e5a353c43314
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5c am: ↵Android Build Merger (Role)
67c9400dce Change-Id: I280df4d139064a8bde767d083777d4a4f7970fad
2019-03-15[automerger] Fix type confusion in libpac am: cad793346e am: dfd6a6fa5cAndroid Build Merger (Role)
Change-Id: I155082d81283161c247af10ec6565965d3d4c48d
2019-03-15[automerger] Fix type confusion in libpac am: cad793346eAndroid Build Merger (Role)
Change-Id: Icd9f904517d9bfc306485a4a91882b1f02987a0e
2019-03-14Fix type confusion in libpacBryan Ferris
From the upstream patch (https://chromium.googlesource.com/v8/v8/+/e33fd30777f99a0d6e16b16d096a2663b1031457%5E%21/#F0): """ Fix HAliasAnalyzer for constants """ Bug: 117606285 Test: /data/local/nativetest/proxy_resolver_v8_unittest/proxy_resolver_v8_unittest Test: gts-tradefed run gts --test \ com.google.android.gts.devicepolicy.DeviceOwnerTest#testProxyPacProxyTest \ --module GtsGmscoreHostTestCases Test: PoC from bug report Merged-In: I2e02d994f107e64e4f465b4d8a02d4159a95240e Change-Id: I297f27c69e94666c9f61efb216244b3d534cd018
2019-03-12Snap for 5367932 from 63ba1ebdbfaf1702e3c7317ec352bb127af7ad14 to qt-releaseandroid-build-team Robot
Change-Id: Icc08e0237794a5ef584b2320af4a8b56ef213751
2019-03-11[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li
master" am: fd137b8322 -s ours am: be2f05fe65 -s ours am: b84b5883f0 -s ours am skip reason: subject contains skip directive Change-Id: Ic31392a351176d07779d0989a11164432453a2a4
2019-03-11[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into ↵Xin Li
master" am: fd137b8322 -s ours am: be2f05fe65 -s ours am skip reason: subject contains skip directive Change-Id: I9835dbe1493740201cef4098e228f19727ceb074
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
c50b4424a6 -s ours am: 4ebb70c6b6 -s ours am: 6be9ea34f4 -s ours am skip reason: subject contains skip directive Change-Id: I106e9b06b1178cc38ffc0aa3bad1c284e7e5fc26
2019-03-11[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li
am: fd137b8322 -s ours am skip reason: subject contains skip directive Change-Id: I6d0f5a8ad65d6bd24dee51e5ee201ec2b2c139aa
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
c50b4424a6 -s ours am: 4ebb70c6b6 -s ours am skip reason: subject contains skip directive Change-Id: Ic538d37ee1f1830749eebe5b80b1857abde30fcf
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
am: c50b4424a6 -s ours am skip reason: subject contains skip directive Change-Id: I766fd2cf16a1c6e52907362b2db37239ab75b0d2
2019-03-11Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseTreehugger Robot
2019-03-11DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
Bug: 127812889 Change-Id: Ic2a016aeb8b4fa1b5909cff84589c09a235b7d23
2019-03-10Snap for 5364434 from c45a637ac1140c6911c109f04124b1e5fe2f381f to qt-releaseandroid-build-team Robot
Change-Id: Ia51abd35132186603e73762fa00d5524aa6a9e3f
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am: d8d455bd02 -s ours am: 87a320a185 -s ours am: 69b6741df4 -s ours am: b1da5e9163 -s ours am skip reason: subject contains skip directive Change-Id: I7c53fa4af97787c6bca438ac11daf1775fb4f5f0
2019-03-08[automerger skipped] Merge changes from topic ↵Bryan Ferris
"am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into oc-dev am: 13d1d93ab9 am: f25b6c1640 am: 9f3ec0d2b3 am: d192922c36 am: f1773da68d -s ours am skip reason: change_id I2e02d994f107e64e4f465b4d8a02d4159a95240e with SHA1 2894c6aa01 is in history Change-Id: I49cc9ead095557f088a94a20bca3ea92b162f0e8
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am: d8d455bd02 -s ours am: 87a320a185 -s ours am: 69b6741df4 -s ours am skip reason: change_id I72321236f4d4cf8da993addc3ef7a1dc018c434b with SHA1 359b0da753 is in history Change-Id: Ic708d4b326fa846919c86e6fd469e20dae3cc30b
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
oc-dev am: 13d1d93ab9 am: f25b6c1640 am: 9f3ec0d2b3 am: d192922c36 Change-Id: Ie898204ffd77854b91f1b59b0018b716a99568ea
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 062342ae31 -s ours am: 9507f3d10d am: fca2f5368d -s ours am skip reason: subject contains skip directive Change-Id: Ib8ead289d92334e1ff053b79342b11b943e04c06
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix type confusion in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 891f56d1f8 -s ours am: 61a35b0fcb am: d20e3e4154 -s ours am skip reason: subject contains skip directive Change-Id: I0b53efde06b728ba7a12990479b3bed000006a2d
2019-03-08[automerger skipped] Merge "Fix type confusion in libpac" into pi-dev am: ↵Bryan Ferris
a3f4541b99 am: c328cfcfee -s ours am skip reason: change_id I2e02d994f107e64e4f465b4d8a02d4159a95240e with SHA1 2894c6aa01 is in history Change-Id: Ia00021d8d0b9dd05ef6f42ce465af319be3ab1fb
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am: d8d455bd02 -s ours am: 87a320a185 -s ours am skip reason: subject contains skip directive Change-Id: I31c15f5e4acb76ea6dfa63bec6227e906e5cc19a
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
oc-dev am: 13d1d93ab9 am: f25b6c1640 am: 9f3ec0d2b3 Change-Id: Ic4a5aa2a03e15d35cdb90ecb9ec15f51a6dc229c
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am: d8d455bd02 -s ours am skip reason: change_id I72321236f4d4cf8da993addc3ef7a1dc018c434b with SHA1 359b0da753 is in history Change-Id: I64d4c99ae99fb7989642b423f2f713d2a09278e6
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 062342ae31 -s ours am: 9507f3d10d Change-Id: Id34a70e24c0e1d06e4d815818565c5133eeb1e9e
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
oc-dev am: 13d1d93ab9 am: f25b6c1640 Change-Id: Iada7df8e2606ae1b6215b64046412fa6ee959b06
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix type confusion in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 891f56d1f8 -s ours am: 61a35b0fcb Change-Id: I9b7e35acef549eec064e95c8a0218cf9e3262022
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 062342ae31 -s ours am skip reason: subject contains skip directive Change-Id: Id2e4ad274d6c0e494f433dbff36484c043fbbeb8
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix type confusion in ↵Bryan Ferris
libpac" into oc-mr1-dev am: 891f56d1f8 -s ours am skip reason: subject contains skip directive Change-Id: I6c072c49015a1eb5e5006a9d61e97263a1d0b4b6
2019-03-08Merge "Fix type confusion in libpac" into pi-devBryan Ferris
am: a3f4541b99 Change-Id: I18062aba6c8fdec0590cdf5ff2d73a92a82a6c6f
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in ↵Bryan Ferris
libpac" into oc-dev am: 4769f48036 -s ours am skip reason: change_id I72321236f4d4cf8da993addc3ef7a1dc018c434b with SHA1 1156762647 is in history Change-Id: I9e48f6b9879567a0be967423ca67ccde5cca6f08
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into oc-devBryan Ferris
am: 13d1d93ab9 Change-Id: I7b5baf9ad7ffe9d3fc2d14faba8e8e354046160d
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in libpac" into oc-mr1-devBryan Ferris
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix Integer Overflow in libpac" into oc-devBryan Ferris
2019-03-08Merge "Fix type confusion in libpac" into pi-devBryan Ferris
2019-03-08Merge "[RESTRICT AUTOMERGE] Fix type confusion in libpac" into oc-mr1-devBryan Ferris
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
nyc-mr2-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 am: 7a551be4c7 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into cw-f-devBryan Ferris
* changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
nyc-mr1-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into ↵Bryan Ferris
nyc-dr1-dev * changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08Merge changes from topic "am-a59f7c6d-19e4-4e40-9cf9-2d2b7cb78ff4" into oc-devBryan Ferris
* changes: [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 am: 7a551be4c7 skipped: fca33be935 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 am: 7a551be4c7 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 am: 1af7ad8a36 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce am: 3d52668937 [automerger] [RESTRICT AUTOMERGE] Fix type confusion in libpac am: 16fdb895ce [RESTRICT AUTOMERGE] Fix type confusion in libpac
2019-03-08[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix OOB Access in libpac" ↵Bryan Ferris
into oc-mr1-dev am: 9b2712718d -s ours am: 8f6f370def am: 8519191acf -s ours am skip reason: subject contains skip directive Change-Id: Ifeeeef63f315e9c3de455b387198ff1438f7b203
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 00:19:47 +0000