summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-18[LSC] Add LOCAL_LICENSE_KINDS to external/modp_b64 am: 38a2bcd309android-s-beta-2android-s-beta-1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/modp_b64/+/1588918 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8523bcfe3aef74b4c9c048be03b6f82645acaca4
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/modp_b64Bob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie16eeafcf0ca2330352b4daabb1525698db691c5
2020-04-29Add METADATA to modp_b64: BSD+Apache2=NOTICE am: d54f1b8e9f am: 2569ec99b0 ↵Bob Badour
am: 18a66cdfd4 am: df99ee43a1 am: 4313a2501b Change-Id: I95f24312578398bb679bff94deaa4e1ba00a36c7
2020-04-29Add METADATA to modp_b64: BSD+Apache2=NOTICE am: d54f1b8e9f am: 2569ec99b0 ↵android-s-preview-1Bob Badour
am: 18a66cdfd4 am: df99ee43a1 Change-Id: Ica0557c26a8a2eafd4a14cabbd6869fbdc5d59e2
2020-04-29Add METADATA to modp_b64: BSD+Apache2=NOTICE am: d54f1b8e9f am: 2569ec99b0 ↵Bob Badour
am: 18a66cdfd4 Change-Id: I1ee514673daa22fcad7aa88174487eb1154b0b14
2020-04-29Add METADATA to modp_b64: BSD+Apache2=NOTICE am: d54f1b8e9f am: 2569ec99b0Bob Badour
Change-Id: I847fe7d41925b976902ee90862eba62d8afd0eea
2020-04-29Add METADATA to modp_b64: BSD+Apache2=NOTICE am: d54f1b8e9fandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I3feeee14893d1df3588988ddcb03354438af3214
2020-04-28Add METADATA to modp_b64: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ib44905dc3b782ec4ff8f433465a8c781eaed7ca5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2692adcde2 -s ours am: a52b3b00d4 am: 430d8ad111 am: 9a130de3db -s ours am skip reason: subject contains skip directive Change-Id: I689b459aef9878899984ce9caa46adbb311a8d18
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2692adcde2 -s ours am: a52b3b00d4 am: 430d8ad111 Change-Id: Ie9dc7756340daa2067e7481f912a0313a5810021
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2692adcde2 -s ours am: a52b3b00d4 Change-Id: I6087a7bb50d49f6b47580b8120770ca2423b6217
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2692adcde2 -s ours am skip reason: subject contains skip directive Change-Id: Id5478e2a373f5dc28894d051b40380b270d3df03
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I59f530765257e67dda65ff73f74d8053e86ddb7a
2020-03-31Remove redundant NOTICE symbolic link. am: c424077a48 am: 350661981a am: ↵Bob Badour
5f2fedc4fd am: e33b555d9e am: 3941439a59 Change-Id: I305417e84cfc06e2f2413c7a6e93e5160dafed61
2020-03-31Remove redundant NOTICE symbolic link. am: c424077a48 am: 350661981a am: ↵Bob Badour
5f2fedc4fd am: e33b555d9e Change-Id: Iad8046fcc7f178104d0103bf687de7dec0122133
2020-03-31Remove redundant NOTICE symbolic link. am: c424077a48 am: 350661981a am: ↵Bob Badour
5f2fedc4fd Change-Id: I4ef8022e957f8ab383941bbcc5da7d1fb2c7dac8
2020-03-31Remove redundant NOTICE symbolic link. am: c424077a48 am: 350661981aBob Badour
Change-Id: Idd74a3310a880fde5386cdfd68a81759aa910cbc
2020-03-31Remove redundant NOTICE symbolic link. am: c424077a48 am: 350661981aBob Badour
Change-Id: I19e78222239f5d96ab8389429b91c40c37a309ca
2020-03-31Remove redundant NOTICE symbolic link. am: c424077a48Bob Badour
Change-Id: Ia5400a4ed01debfb07f07ec1e08340de0d0cb95f
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I64c0a659aad6973c34ec9dfa4744f3ada630e170
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 0666054d60 am: d7b108300e -s ours am skip reason: subject contains skip directive Change-Id: I256adb7bf2d9c870f57ffe850ac30f9c4b16d16f
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 0666054d60 Change-Id: I4dd0dae3b5e0c3c98a8f0fa106c25a435ad296cc
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵bender-v1-stableandroid-r-preview-1android-games-sdk-unity-releaseandroid-games-sdk-unity-devXin Li
stage-aosp-master Bug: 142003500 Change-Id: If3d26804a8795fcbd032173287b32aff9dacb7e9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 8e99b15b1a -s ours am: 31a5d9f7d5 -s ours am: fdb57148be -s ours am skip reason: change_id I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78 with SHA1 62a707871e is in history Change-Id: I301263d40956580c4c7b445921518f1bf2a98252
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 8e99b15b1a -s ours am: 31a5d9f7d5 -s ours am skip reason: change_id I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78 with SHA1 62a707871e is in history Change-Id: Id70e6a1c5dbae3ebc158c50e4ef753fa1b7e9d33
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 8e99b15b1a -s ours am skip reason: change_id I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78 with SHA1 62a707871e is in history Change-Id: I21a1cd477f4482bd5849a312dd9f9cd4eec8781d
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I76e33e8bd71c11eb8901e5cf0b25c9cd23177a78 Merged-In: I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
62a707871e -s ours am: 5aa32df838 am: 2824a09eb1 am: 299ccf5b59 -s ours am skip reason: subject contains skip directive Change-Id: I52d842ba728a9c473adae22354b8344c44187376
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
62a707871e -s ours am: 5aa32df838 am: 2824a09eb1 Change-Id: I884ac90120ffa32c707583df6bd39fcf1022d3a6
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
62a707871e -s ours am: 5aa32df838 Change-Id: I65a52049dd27e14b62204e70277f2fcc10070424
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 62a707871e -s ours am skip reason: subject contains skip directive Change-Id: I01ec70f33ba9586c07cac0ec98aee0895818f933
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I5deecae030bca06bb7abfa7d7714cfbe3e0c6a78
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 55b3ea6692 am: cdb53a1c9c -s ours am skip reason: subject contains skip directive Change-Id: I8b6bbdb3bbd0e3434cda051c3e60d87c65546fb7
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 55b3ea6692 Change-Id: Ie5b0cfb5f4b424530fd566637ddc4d396e9339c0
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: Iabbd61e4e4c29fc2db3ed87808b105d3470d79ab
2019-02-06Merge "Add an NDK library variant"android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseTreeHugger Robot
2019-02-05Add an NDK library variantEmilian Peev
An NDK built static variant is needed for clients that build against the NDK. The new library will not be part of the NDK public interface. Bug: 123237859 Test: Camera CTS Change-Id: I379ce9c27c34d54048f4a0f1c3d0b4fadb6abc7e
2019-02-04Merge Android Games SDK into master. am: 7c10f2c02c am: 45c48e4116Xin Li
am: 364265399d Change-Id: I1a6ba7148ce4c9eb6922c4df9535a4a4cbf0853f
2019-02-04Merge Android Games SDK into master. am: 7c10f2c02cXin Li
am: 45c48e4116 Change-Id: I66274c418ed6ba0a6fbdf9b6355532c9e9cd36ce
2019-02-04Merge Android Games SDK into master.android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
am: 7c10f2c02c Change-Id: I90dfa12458ff20a3adcec98f8ee1fc7c0157f672
2019-02-04Merge Android Games SDK 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-releaseXin Li
Bug: 123068679 Change-Id: I4eaab26fa0abcec4a54d01057902f773a26bbf31
2019-01-15Change group owner from update_engine to libchrome. am: 001b174ba0 am: ↵Chih-Hung Hsieh
3fe777594e am: 61a1135e81 Change-Id: Ieedf2ac3aceb34d4e6d50affa239633c30a0d203
2019-01-15Change group owner from update_engine to libchrome. am: 001b174ba0Chih-Hung Hsieh
am: 3fe777594e Change-Id: I02e6e5bbbcd52fe22eb7259a3cf9755d5bdd5f33
2019-01-15Change group owner from update_engine to libchrome.Chih-Hung Hsieh
am: 001b174ba0 Change-Id: I8ab4243fd23d1f3bcc205bf0a4ee2bee7568a8a0
2019-01-15Change group owner from update_engine to libchrome.Chih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I69da51a7d79fab934cd87a85e88ebafca32836ae
2019-01-14Add default code reviewers into OWNERS am: 013967ac43 am: 60d56de34fChih-Hung Hsieh
am: 4de7f1dffe Change-Id: Idf12d163b554bc6fc0f9f49ae4801c8f36f4d4bc
2019-01-14Add default code reviewers into OWNERS am: 013967ac43Chih-Hung Hsieh
am: 60d56de34f Change-Id: I1e3817b639c8577635bfc9aef81f6a1b2af4da36
2019-01-14Add default code reviewers into OWNERSChih-Hung Hsieh
am: 013967ac43 Change-Id: I94bcd8e0ab5d3fae1f981b03917a366cc38cefb5
2019-01-14Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ic95c415e066536f90c6869e65087e5dc0340466f
2018-11-01Mark libmodpb64 as recovery_available for update_engine_sideload am: ↵Dan Willemsen
df5b9e2d80 am: 91bd921181 am: e798b635f8 Change-Id: I27f50d39c56c380fee94a58b9f3fbba73b580880
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 10:48:43 +0000