aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-21Snap for 7160059 from ef7d020fc69e774d6fd43e44ed3c94f4843d04d7 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r32android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-releaseandroid-build-team Robot
Change-Id: I91f96cc8c1819ebd92d579d3da9a933316e839f6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9684f8b93 -s ↵android-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-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: f249d48c08 -s ours am skip reason: Change-Id I497b79c3890b8221742701ed28e2c53093c98af8 with SHA-1 14a3531d53 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67a008a845693450b8269f57daeee659bacbca64
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d9684f8b93 -s oursXin Li
am skip reason: Change-Id I497b79c3890b8221742701ed28e2c53093c98af8 with SHA-1 14a3531d53 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iac7518c5d3b0d687a1ce112af1ac1c0424894a06
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I497b79c3890b8221742701ed28e2c53093c98af8 Change-Id: I6c778e6c853deb435fc30cae9e351cf23a1d32bc
2021-02-18Snap for 7152399 from 1c330d37c60ab8ec78b152bc71a2ba789bc16d86 to sc-releaseandroid-build-team Robot
Change-Id: Ic0131c73f020ec3044176c66ffed02db133ca570
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100 am: ↵Bob Badour
148bc4cd83 am: ec5906fef4 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80664966522bc3a02ccb66daff391d56da90ed10
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100 am: 148bc4cd83Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iffab3ac175d3086586d1d17a76c40473f569c332
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/brotli am: 58dd9b2100Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1588654 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I92d3635ece537cd53948672cc532d0ff8d0179a9
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/brotliandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-Unlicense legacy_permissive legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Id2a819728240b05b6663e947ca01a6ae3124123f
2020-11-25Snap for 6993684 from ad9957d4771203935961582c969c92c48a289bf9 to sc-releaseandroid-build-team Robot
Change-Id: I57bb37ba92a69b14788f82cd786b1da487b4fc4c
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 60cc560dff am: ↵TreeHugger Robot
14a3531d53 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/13112599 Change-Id: Ide18eb45599ae50364993343f2bbfa3e0dfec213
2020-11-24Snap for 6991248 from cbf81c9afce986399c29f431e14dba3407c98f8b to sc-releaseandroid-build-team Robot
Change-Id: I5721e5ea8405d7521deebfdd95202cc5b22aa37a
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 60cc560dffTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/13112599 Change-Id: I497b79c3890b8221742701ed28e2c53093c98af8
2020-11-24Merge "Mark ab/6881855 as merged" into stage-aosp-masterTreeHugger Robot
2020-11-23Merge "Make libbrotli vendor_ramdisk_available for snapuserd." am: ↵David Anderson
489ec4cb53 am: 08d1f3bb18 am: 6fe0692037 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1500596 Change-Id: Ib9d4196cee3e418f90baa462456d5cfc7b5d2c7c
2020-11-23Merge "Make libbrotli vendor_ramdisk_available for snapuserd." am: ↵David Anderson
489ec4cb53 am: 08d1f3bb18 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1500596 Change-Id: I879f5df786c3c26a34971b374f093200f22b6468
2020-11-23Merge "Make libbrotli vendor_ramdisk_available for snapuserd." am: 489ec4cb53David Anderson
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1500596 Change-Id: Iae8f92b72e14796236fbb5fb5593dd5e9bfbdd5c
2020-11-23Merge "Make libbrotli vendor_ramdisk_available for snapuserd."David Anderson
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I4b10794c319b937cdd7962dc5e0fe67306a49464
2020-11-16Make libbrotli vendor_ramdisk_available for snapuserd.David Anderson
Bug: 173463595 Test: snapuserd builds Change-Id: I05327335952bf47ad04676767c02b3975deb0f3e
2020-11-14Snap for 6972283 from 3f98acb922bdd1bb0703f7238a1e8e38262b7934 to sc-releaseandroid-build-team Robot
Change-Id: I2b343d6022162f40049040bd6f2f68f48ea635cd
2020-11-13Add componentid for fuzzer am: f69b4ab31b am: 139d69755e am: f96c58c608 am: ↵Branden Archer
4df1c890c7 Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1498436 Change-Id: I94e2ee8c20258d0b8f9c72825770d607f06b2f7d
2020-11-13Add componentid for fuzzer am: f69b4ab31b am: 139d69755e am: f96c58c608Branden Archer
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1498436 Change-Id: I4e18dfbe5b55523011f01de5d2f7c340bcfd02c1
2020-11-13Add componentid for fuzzer am: f69b4ab31b am: 139d69755eBranden Archer
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1498436 Change-Id: I28376289696f8bc2ee1c48564d016716e094c7d4
2020-11-13Add componentid for fuzzer am: f69b4ab31bBranden Archer
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1498436 Change-Id: Ic31bdbabd801346d13cfce7e63b08ce9b7a17752
2020-11-12Add componentid for fuzzerBranden Archer
Bug: 170243740 Test: Builds Change-Id: I84ecc8612b7b1db9b82d9eb1d3e2d66cb636eb7a
2020-11-04Snap for 6950159 from 391dac16f5732bbf1357b0c092929acfbddcb741 to sc-releaseandroid-build-team Robot
Change-Id: Ieeb313b524974a3d85ffc17bf0835091fee49d58
2020-11-02Enable brotli's fuzzer am: 238bb167ce am: 46b7b15440 am: 2e12135358 am: ↵Branden Archer
a060039d3b Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1483340 Change-Id: If06fae83205370f92c9c329a8f5c79594ba5fcfe
2020-11-02Enable brotli's fuzzer am: 238bb167ce am: 46b7b15440 am: 2e12135358Branden Archer
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1483340 Change-Id: Ieac7a57ae7fb4d4f31b82d70b9281429983b428c
2020-11-02Enable brotli's fuzzer am: 238bb167ce am: 46b7b15440Branden Archer
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1483340 Change-Id: I161fe07910dc78b8c0e4c421cb5367757b3fc908
2020-11-02Enable brotli's fuzzer am: 238bb167ceBranden Archer
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1483340 Change-Id: I8c79f6b707dc523f55a8cbe1737010d2224ca12d
2020-11-02Enable brotli's fuzzerBranden Archer
Bug: 170243740 Test: Builds and runs on emulator Change-Id: If63a7e85381dd00956588a2bcffb74a2d4c4b7c8
2020-10-24Snap for 6928482 from 4f4bb8b1b1eb83c677053b81e4aa26ef5042f975 to sc-releaseandroid-build-team Robot
Change-Id: Ia66f2fb92820d59358cd8aeb30fe46a4122f70ac
2020-10-24[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
a80231b6cf -s ours am skip reason: Change-Id Ie9daf1fb1ab187a2e693eb1fade676feeb7e8bec with SHA-1 a7ff896f8c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/12911178 Change-Id: I3e91bb16b4273a7b5184b7233a1b1f7e353bc5dd
2020-10-24Snap for 6927337 from 108564cec5d233f0e0cf6f548e2ac66b974dc4e5 to sc-releaseandroid-build-team Robot
Change-Id: If98bad76791387a501ae002d263ad85861abc79c
2020-10-23Migrate system/core/adb to packages/modules/adbandroid-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseBaligh Uddin
BUG: 167963357 Test: TH Merged-In: Ie9daf1fb1ab187a2e693eb1fade676feeb7e8bec Change-Id: I9390e1c9c3294080fe6f0374c6908f975e5228d8
2020-10-23[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
43a62ef01a am: c59d81ec1a -s ours am: c3da407a89 -s ours am: 40d288f424 -s ours am skip reason: Change-Id I5c685de70012039e9ffcc61e37880f53dece79cb with SHA-1 97e053afa3 is in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1465304 Change-Id: If48c0e25b3dddaa8ec9b2a9e9da9866557a22c62
2020-10-23[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
43a62ef01a am: c59d81ec1a -s ours am: c3da407a89 -s ours am skip reason: Change-Id I5c685de70012039e9ffcc61e37880f53dece79cb with SHA-1 97e053afa3 is in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1465304 Change-Id: I2fb7147a94628bf57d0bfab4a3ee8ae1c6c7330b
2020-10-23[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
43a62ef01a am: c59d81ec1a -s ours am skip reason: Change-Id I5c685de70012039e9ffcc61e37880f53dece79cb with SHA-1 97e053afa3 is in history Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1465304 Change-Id: I67fe7821b042ee183bc5ca3c6eeaba1c8feb1db4
2020-10-23Migrate system/core/adb to packages/modules/adb am: 43a62ef01aBaligh Uddin
Original change: https://android-review.googlesource.com/c/platform/external/brotli/+/1465304 Change-Id: I675accf98439072841d7bc5ea68abf797ab43e7e
2020-10-23[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
97e053afa3 -s ours am: f2032fe7a5 -s ours am skip reason: Change-Id Idb2fd8765a050465500d2811a990bd508938d977 with SHA-1 cfb8320891 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/12902816 Change-Id: Ie61feb5c7da57fd55a0b8832fe862de9fa084c50
2020-10-23[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
97e053afa3 -s ours am skip reason: Change-Id Idb2fd8765a050465500d2811a990bd508938d977 with SHA-1 cfb8320891 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/12902816 Change-Id: Ic24c29daf543e596b413e6df8a16a1535cd77903
2020-10-23Migrate system/core/adb to packages/modules/adbBaligh Uddin
BUG: 167963357 Test: TH Merged-In: I5c685de70012039e9ffcc61e37880f53dece79cb Change-Id: Ie9daf1fb1ab187a2e693eb1fade676feeb7e8bec
2020-10-23[automerger skipped] Migrate system/core/adb to packages/modules/adb am: ↵Baligh Uddin
cfb8320891 -s ours am skip reason: Change-Id Ie9daf1fb1ab187a2e693eb1fade676feeb7e8bec with SHA-1 a7ff896f8c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/12902784 Change-Id: Ibb4ae2899d1fb6d3b8bef9fe7782dbd287b986cd
2020-10-23Snap for 6924456 from a7ff896f8c77963ab682a345f2e5b7edba3e0230 to sc-releaseandroid-build-team Robot
Change-Id: I433ae052ca5abee7da42d08b8be21f946461177b
2020-10-22Migrate system/core/adb to packages/modules/adbBaligh Uddin
BUG: 167963357 Test: TH Merged-In: Idb2fd8765a050465500d2811a990bd508938d977 Change-Id: I5c685de70012039e9ffcc61e37880f53dece79cb
2020-10-22Migrate system/core/adb to packages/modules/adbBaligh Uddin
BUG: 167963357 Test: TH Merged-In: Ie9daf1fb1ab187a2e693eb1fade676feeb7e8bec Change-Id: Idb2fd8765a050465500d2811a990bd508938d977
2020-10-21Migrate system/core/adb to packages/modules/adbBaligh Uddin
BUG: 167963357 Test: TH Change-Id: Ie9daf1fb1ab187a2e693eb1fade676feeb7e8bec
2020-10-10Snap for 6896080 from c69487cc3f21cc190edc679bc773f14672cd47a5 to sc-releaseandroid-build-team Robot
Change-Id: I606494b45e899a29a9d527657e27d27fcadcf188
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: dd89b2a694 -s ours am: ↵Xin Li
bf027211af -s ours am: 6b2e8fe2fc -s ours am skip reason: Change-Id I9418f77b2cadfc50c4a4ce8d6429bbc6e177b39f with SHA-1 6fd2a3524f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/brotli/+/12797061 Change-Id: Ib106cffbcfbe67ebb65fa6bfec3e0b5cf31f8deb