summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: acbb97f1bf -s ↵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-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_r16mastermainandroid12L-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: c83535a66f -s ours am skip reason: Change-Id I2356b3b1612e516fee817b805f7b5cbfc6f6cb59 with SHA-1 302cd3e1b6 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0778a17a624cf672bc46c028c29cb560b3857307
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: acbb97f1bf -s oursXin Li
am skip reason: Change-Id I2356b3b1612e516fee817b805f7b5cbfc6f6cb59 with SHA-1 302cd3e1b6 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8f5ebd5285f6f25047ff770b18725a0455c27696
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: I2356b3b1612e516fee817b805f7b5cbfc6f6cb59 Change-Id: Icdc3785714b5cb54a1e456cc9cd2a02a9f3f36b2
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/drrickorang am: 3e7698378a am: ↵Bob Badour
327bcbb605 am: 71e55047ce Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1588981 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0250018952a4d977a2ef0cbe621d599b495933ca
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/drrickorang am: 3e7698378a am: ↵Bob Badour
327bcbb605 Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1588981 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2ab9e197fc3d21cce34f36a683b4696406c9cb88
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/drrickorang am: 3e7698378aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1588981 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id90e7fcb26a603f28a3c83ae6de96f32059db653
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/drrickorangandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: LoopbackApp/Android.bp LoopbackApp/app/src/main/cpp/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I8f4a91c138ea047a3025816afccf9d24f638a9dd
2020-11-24Mark ab/6881855 as merged am: 6e42d6d4ef am: 302cd3e1b6Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/13112090 Change-Id: Ic729ad0a0731c31d3963b84a07bdfd12645610c6
2020-11-24Mark ab/6881855 as merged am: 6e42d6d4efXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/13112090 Change-Id: I2356b3b1612e516fee817b805f7b5cbfc6f6cb59
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ieeab8d5da3349cd63335de41a16f2641430fd49c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 03c46670f7 -s ours am: ↵Xin Li
171df8dfe0 -s ours am: 748ae97b66 -s ours am skip reason: Change-Id I456c8d06c43d9eae43f995a7ec315627771c9c0c with SHA-1 4c5bd1c865 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12796859 Change-Id: I2ca569abfc11ed7956bb262889b2eaca8ef3a168
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 03c46670f7 -s ours am: ↵Xin Li
171df8dfe0 -s ours am skip reason: Change-Id I456c8d06c43d9eae43f995a7ec315627771c9c0c with SHA-1 4c5bd1c865 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12796859 Change-Id: Ifd3237148c4e6ece4f7cd90dfd8569ff76d72b82
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 03c46670f7 -s oursXin Li
am skip reason: Change-Id I456c8d06c43d9eae43f995a7ec315627771c9c0c with SHA-1 4c5bd1c865 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12796859 Change-Id: I1458a620fd7cebe582b62d78a682fdd265163499
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I456c8d06c43d9eae43f995a7ec315627771c9c0c Change-Id: I64b104f38171af587514c75508f9409bbc05c92d
2020-09-11[automerger skipped] Merge Android R am: 337e97fb2c -s ours am: baab496f1f ↵Xin Li
-s ours am: 1c621c25ed -s ours am: 47096bf3f3 -s ours am: 463afc1322 -s ours am skip reason: Change-Id Idb5917901dd699dbdc62064c113543cabd873ed1 with SHA-1 173ce2b811 is in history Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1422348 Change-Id: Ibe762de133da07697c08f9e3fa6e4d50f8f87907
2020-09-11[automerger skipped] Merge Android R am: 337e97fb2c -s ours am: baab496f1f ↵Xin Li
-s ours am: 1c621c25ed -s ours am: 47096bf3f3 -s ours am skip reason: Change-Id Idb5917901dd699dbdc62064c113543cabd873ed1 with SHA-1 173ce2b811 is in history Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1422348 Change-Id: I237cbd9d5ceeaa90c5e1230417958f536e9f0b52
2020-09-11[automerger skipped] Merge Android R am: 337e97fb2c -s ours am: baab496f1f ↵Xin Li
-s ours am: 1c621c25ed -s ours am skip reason: Change-Id Idb5917901dd699dbdc62064c113543cabd873ed1 with SHA-1 173ce2b811 is in history Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1422348 Change-Id: I4bae1a04010eda8c8360e7e529b82cc6d84dad8b
2020-09-11[automerger skipped] Merge Android R am: 337e97fb2c -s ours am: baab496f1f ↵Xin Li
-s ours am skip reason: Change-Id Idb5917901dd699dbdc62064c113543cabd873ed1 with SHA-1 173ce2b811 is in history Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1422348 Change-Id: Ibe0a837ce38e18db0ab7e1209f900f51b3201bcf
2020-09-11[automerger skipped] Merge Android R am: 337e97fb2c -s oursXin Li
am skip reason: Change-Id Idb5917901dd699dbdc62064c113543cabd873ed1 with SHA-1 173ce2b811 is in history Original change: https://android-review.googlesource.com/c/platform/external/drrickorang/+/1422348 Change-Id: Id7bf2bd11cc145235dd5f1a3892eee88ab0324ce
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Idb5917901dd699dbdc62064c113543cabd873ed1 Change-Id: Ie37294bd2ca1ed40a48ecde24a3515d1d75f5032
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 173ce2b811 -s ours am: 0e4501c291 -s ours am: fd71be3e9e -s ours am: 022850a340 -s ours am skip reason: Change-Id I76748c4e045123f3d7156550e9c75478aeb0d651 with SHA-1 46e5018de4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12470162 Change-Id: I9b92e9c61d019a6b629bcca66f8042f08222cd30
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 173ce2b811 -s ours am: 0e4501c291 -s ours am: fd71be3e9e -s ours am skip reason: Change-Id I76748c4e045123f3d7156550e9c75478aeb0d651 with SHA-1 46e5018de4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12470162 Change-Id: I7434bdec5082c63b940fab5fcbb35a60d6cd9fcb
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 173ce2b811 -s ours am: 0e4501c291 -s ours am skip reason: Change-Id I76748c4e045123f3d7156550e9c75478aeb0d651 with SHA-1 46e5018de4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12470162 Change-Id: Iefd8b1bb50f9f39b1b31a59ee015d0da2e7d1471
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 173ce2b811 -s ours am skip reason: Change-Id I76748c4e045123f3d7156550e9c75478aeb0d651 with SHA-1 46e5018de4 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/drrickorang/+/12470162 Change-Id: Id8f58f58fa0b1005b571753ee45281e331e7a351
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I76748c4e045123f3d7156550e9c75478aeb0d651 Change-Id: Idb5917901dd699dbdc62064c113543cabd873ed1
2020-04-30Add METADATA to drrickorang: Apache2=NOTICE am: b981be6f39 am: f1a513d32b ↵Bob Badour
am: 46e5018de4 am: 4c5bd1c865 am: 2f4d455cf4 Change-Id: I394002180cb1bc2dcd932b178dffa0ea1d3a14ff
2020-04-30Add METADATA to drrickorang: Apache2=NOTICE am: b981be6f39 am: f1a513d32b ↵Bob Badour
am: 46e5018de4 am: 4c5bd1c865 Change-Id: Icaa0946abdacc93f28958201728feb446e6dcfbd
2020-04-30Add METADATA to drrickorang: Apache2=NOTICE am: b981be6f39 am: f1a513d32b ↵Bob Badour
am: 46e5018de4 Change-Id: I456c8d06c43d9eae43f995a7ec315627771c9c0c
2020-04-30Add METADATA to drrickorang: Apache2=NOTICE am: b981be6f39 am: f1a513d32bBob Badour
Change-Id: I76748c4e045123f3d7156550e9c75478aeb0d651
2020-04-30Add METADATA to drrickorang: Apache2=NOTICE am: b981be6f39android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I0a58d71b5a418d1a20808996e7e3ae6c4a949d0b
2020-04-29Add METADATA to drrickorang: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I3a4f290b95754e4cf1e47c4dba00ad2e2bfaad72
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fc08bca912 -s ours am: 8a6d156c3f am: 52440ed9b6 am: 7767c22a43 -s ours am skip reason: subject contains skip directive Change-Id: Ia630d47eec667a9273ab8d524a0f44394cb9b8a5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fc08bca912 -s ours am: 8a6d156c3f am: 52440ed9b6 Change-Id: Ie7f5e6213541e2efe16461fe2848ed9fe165be13
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fc08bca912 -s ours am: 8a6d156c3f Change-Id: I7f7d7c7a44ff19d08e04d61bf133cc34651e2880
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: fc08bca912 -s ours am skip reason: subject contains skip directive Change-Id: I9e8750b88bfac1d87531bcf92ff4fcf97bb5c42d
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I9153965d00a931b491f30043b5c4d5682343f870
2020-03-26Remove redundant NOTICE copied from LICENSE. am: bae540989b am: c144ccc1f8 ↵Bob Badour
am: 9a73de276b am: 66ca1b282b am: 1040fd847a Change-Id: I19380c856019ddbab9744a979599fbc74773d12b
2020-03-26Remove redundant NOTICE copied from LICENSE. am: bae540989b am: c144ccc1f8 ↵Bob Badour
am: 9a73de276b am: 66ca1b282b Change-Id: I79c1c6c85f3f438384eab89b3010cc8a4be2076a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: bae540989b am: c144ccc1f8 ↵Bob Badour
am: 9a73de276b Change-Id: Ia26f66b76457d57c7a267d5d705a6d4f48b5b5fe
2020-03-26Remove redundant NOTICE copied from LICENSE. am: bae540989b am: c144ccc1f8Bob Badour
Change-Id: Ib94824a56ab5cb30d9c0b1f4b5cce1628efebfa7
2020-03-26Remove redundant NOTICE copied from LICENSE. am: bae540989b am: c144ccc1f8Bob Badour
Change-Id: Ida44081314dd3904296f44585afea2ceca0b03d5
2020-03-26Remove redundant NOTICE copied from LICENSE. am: bae540989bBob Badour
Change-Id: I28884e7af2352697b7b4022768d6d24704ad3799
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ifdecb7b16f049680350e746fe3169fc96ad0560d
2020-02-12Merge "Deprecate OpenSL ES for Android as of API level 30 (R)"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_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_r16android11-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-b-releaseGlenn Kasten
2020-02-12Add OWNERSGlenn Kasten
Test: N/A Change-Id: Ia808acdae2e210278afce4b1795fac0eb7a2ee06
2020-02-11Deprecate OpenSL ES for Android as of API level 30 (R)Glenn Kasten
Bug: 134958169 Test: try with an NDK r21 canary for both R and earlier, and a pre-21 NDK Change-Id: Ie0a317debd07230d344218c5874f3060dc3ab85f
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 9ace52f670 am: 0d71c83b89 -s ours am skip reason: subject contains skip directive Change-Id: I9458bf6297c77ec245fed81736e2286cc12486a9
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: 9ace52f670 Change-Id: Id3581bfec0e9dd780ab34b3d6b4d3d24d26b253b
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I6d72dc02cddb6a66ca059b196000125323dd8085
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 3162e8aa61 -s ours am: adccb8feda -s ours am: dd972cd5fd -s ours am skip reason: change_id I2f97c75036ec82748707c78058b9818ea42ae893 with SHA1 1e017ab7c3 is in history Change-Id: I91a9598cb86d31faff00bb27d756323c9fffd046
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 18:01:11 +0000