aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 978a5d03e1 -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: 4c12b4720b -s ours am skip reason: Change-Id Ie43615061948e35099344d3da2dd1b92bf0eac8c with SHA-1 eab237cb8d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idc3bd9f32d1ba1b504032a389f43eb0e071413c5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 978a5d03e1 -s oursXin Li
am skip reason: Change-Id Ie43615061948e35099344d3da2dd1b92bf0eac8c with SHA-1 eab237cb8d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10a164553b3c1eda27438eeebe4541ee104ccb66
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: Ie43615061948e35099344d3da2dd1b92bf0eac8c Change-Id: I815c62afd2ec874c143cfa55d64b547530e54517
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libxkbcommon am: db41fce8ee am: ↵Bob Badour
7e04e34f00 am: 10f3dea9fb Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1588956 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9a62d290a796304b2934674c1ad182016f4af620
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libxkbcommon am: db41fce8ee am: ↵Bob Badour
7e04e34f00 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1588956 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2909b2012dc164e1c9507f6019ee98fdeb4e59fd
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libxkbcommon am: db41fce8eeBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1588956 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0ef3a78724a56b6885eb6a842abfb209ef9c981
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libxkbcommonandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-ISC SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I29d842136887cd510fc14bda6492a5ec5cc1d7c1
2021-01-25Upgrade libxkbcommon to xkbcommon-1.0.3 am: 91f38399c2 am: 347a79aaea am: ↵Haibo Huang
6180785875 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1510331 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I306ae73de77ff970b21744db39df068b53c57786
2021-01-25Upgrade libxkbcommon to xkbcommon-1.0.3 am: 91f38399c2 am: 347a79aaeaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1510331 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I42a9cf03f4613dcfd09e0f1d9fa213acaea85545
2021-01-25Upgrade libxkbcommon to xkbcommon-1.0.3 am: 91f38399c2Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1510331 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3bbaf961a3f3af074718579c23be02f5378e50d
2021-01-25Upgrade libxkbcommon to xkbcommon-1.0.3Haibo Huang
1. Run meson build locally: meson config -Denable-x11=false -Denable-wayland=false -Denable-docs=false cd config ninja 2. Remove #defines for missing functions Test: make Change-Id: Ia109e0203569acb6380e2147c095fae57782fb72
2021-01-24Fix license_type. Contains GPL code. am: cda6b377eb am: 5490c6cc47 am: ↵Bob Badour
2fec01ba69 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1556523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I56676e8be26dc75b59d5f9ca313303449a3b98db
2021-01-24Fix license_type. Contains GPL code. am: cda6b377eb am: 5490c6cc47Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1556523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie44d80b759e7def578cdb40872793d5de612d8fd
2021-01-23Fix license_type. Contains GPL code. am: cda6b377ebBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1556523 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I526eba29d6ae0775e2f8bd153d302d68134eafe5
2021-01-21Fix license_type. Contains GPL code.Bob Badour
See: http://go/android-license-checking-v2-lsc Test: m all Bug: 151953481 Bug: 151177513 Bug: 67772237 Change-Id: I3da0022efdabb08f1c595b2940d871976865a289
2020-11-24Mark ab/6881855 as merged am: 494ce04807 am: eab237cb8dXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libxkbcommon/+/13112784 Change-Id: I90b05b4cc64cd6f63f177d510fed1caa89697780
2020-11-24Mark ab/6881855 as merged am: 494ce04807Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libxkbcommon/+/13112784 Change-Id: Ie43615061948e35099344d3da2dd1b92bf0eac8c
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: If91229171589d45eedc0be5025049ccff52d72a2
2020-11-04Merge "Add the janitors to OWNERS." am: 8adc8495c6 am: a948866ed2 am: ↵Treehugger Robot
8f387bc8b9 am: 52477331e2 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1486346 Change-Id: I2172b39816c2e96b7c5f77dbf1a3b7f8e75bb92d
2020-11-04Merge "Add the janitors to OWNERS." am: 8adc8495c6 am: a948866ed2 am: 8f387bc8b9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1486346 Change-Id: I7bdb351b8143f98635c4b448925c2b170b5345ad
2020-11-04Merge "Add the janitors to OWNERS." am: 8adc8495c6 am: a948866ed2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1486346 Change-Id: Iab9a21f9e747abbf3223536c899ad142d2a771c2
2020-11-04Merge "Add the janitors to OWNERS." am: 8adc8495c6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1486346 Change-Id: I16385d864e2e5940a44f8f89dff68cea0d6f6147
2020-11-04Merge "Add the janitors to OWNERS."Treehugger Robot
2020-11-03Add the janitors to OWNERS.Elliott Hughes
Test: treehugger Change-Id: I22da804e3ce5332a0c6ef331fe55b99de8c93949
2020-11-03Upgrade libxkbcommon to xkbcommon-1.0.1 am: 44a37d780c am: bfc5d50c3e am: ↵Haibo Huang
ef44d88d80 am: 42ca708878 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1479536 Change-Id: Id3cbd75868ff885b0bedeffcc7a89c0b520e295b
2020-11-03Upgrade libxkbcommon to xkbcommon-1.0.1 am: 44a37d780c am: bfc5d50c3e am: ↵Haibo Huang
ef44d88d80 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1479536 Change-Id: I6a68f54eb26753362b8a4d4031b0edee15b9c734
2020-11-03Upgrade libxkbcommon to xkbcommon-1.0.1 am: 44a37d780c am: bfc5d50c3eHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1479536 Change-Id: I29925ade0fbe2ff50c69e9e8249312bd0443cb64
2020-11-03Upgrade libxkbcommon to xkbcommon-1.0.1 am: 44a37d780cHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1479536 Change-Id: I017637f2c8cec12bdd2cede28a7cf0e3e181137c
2020-10-30Upgrade libxkbcommon to xkbcommon-1.0.1Haibo Huang
1. Run meson build locally: meson config -Denable-x11=false -Denable-wayland=false -Denable-docs=false 2. Copy over generated parser.h / parser.c 3. Copy over config.h 4. Remove #defines for missing functions Test: make Change-Id: I3911b932c4d63930118c7e0300b299788c0b3d00
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 764a7c5976 -s ours am: ↵Xin Li
0d7018244f -s ours am: 343a893ca2 -s ours am skip reason: Change-Id I241f5a59c9c6ff2c4df19e454ac6cdbe77f6e85a with SHA-1 75e37c165d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libxkbcommon/+/12796974 Change-Id: I9f2f003f78164b6ea633cb3c812f613351568b21
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 764a7c5976 -s ours am: ↵Xin Li
0d7018244f -s ours am skip reason: Change-Id I241f5a59c9c6ff2c4df19e454ac6cdbe77f6e85a with SHA-1 75e37c165d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libxkbcommon/+/12796974 Change-Id: Ie2606e4af279094a271ce0b34a2e1bf84e22c974
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 764a7c5976 -s oursXin Li
am skip reason: Change-Id I241f5a59c9c6ff2c4df19e454ac6cdbe77f6e85a with SHA-1 75e37c165d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libxkbcommon/+/12796974 Change-Id: I16906a203843ac34c25021320ca155a75f14610b
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I241f5a59c9c6ff2c4df19e454ac6cdbe77f6e85a Change-Id: I9ff1457e10cd50e5fd6f786c99853bd53a7f6e1c
2020-09-11Upgrade libxkbcommon to xkbcommon-1.0.0 am: bffa8499cb am: 355b04ef6c am: ↵Haibo Huang
41abe66705 am: 1cb698d8f0 am: a2eea36d51 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1422356 Change-Id: I55621ae8beab6ccaca55d275cb0da7bee6fe9e14
2020-09-11Upgrade libxkbcommon to xkbcommon-1.0.0 am: bffa8499cb am: 355b04ef6c am: ↵Haibo Huang
41abe66705 am: 1cb698d8f0 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1422356 Change-Id: Ic39c28b087dd3bfa74d3cc9c3b0c49393fdad0fa
2020-09-11Upgrade libxkbcommon to xkbcommon-1.0.0 am: bffa8499cb am: 355b04ef6c am: ↵Haibo Huang
41abe66705 Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1422356 Change-Id: Ib88f1aac9390897eb6f67bb64573197bd535577a
2020-09-11Upgrade libxkbcommon to xkbcommon-1.0.0 am: bffa8499cb am: 355b04ef6cHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1422356 Change-Id: I0d0abc3c5f75cc478e9f65744d01202ef2e85e6e
2020-09-11Upgrade libxkbcommon to xkbcommon-1.0.0 am: bffa8499cbHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/libxkbcommon/+/1422356 Change-Id: Ic2eb794603d87434e613c726f3e9a1f2fa3f4290
2020-09-10Upgrade libxkbcommon to xkbcommon-1.0.0Haibo Huang
1. Run meson build locally: meson config -Denable-x11=false -Denable-wayland=false -Denable-docs=false 2. Copy over generated parser.h / parser.c 3. Copy over config.h, and remove defines for not supported functions. Change-Id: Id7f3c822c1d958fa541685344961507bcfa03b17
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bbdf399346 -s ours am: e4e474780d am: 75e37c165d am: cbf379a235 -s ours am skip reason: subject contains skip directive Change-Id: I7db868586fd55cfea57c576a26ae911fb8e5fc4d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bbdf399346 -s ours am: e4e474780d am: 75e37c165d Change-Id: I8f96aa88a35f6672423cb22bc3b6f2b03930b4ea
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bbdf399346 -s ours am: e4e474780d Change-Id: I241f5a59c9c6ff2c4df19e454ac6cdbe77f6e85a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: bbdf399346 -s ours am skip reason: subject contains skip directive Change-Id: I1f5985933bc1dd9fac4b4ac85fe97ad8e380cc57
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: Ia9cce3746226391880e4946e4e459f2bcf82ec54
2020-03-26Remove redundant NOTICE copied from LICENSE. am: d06c42c400 am: fcfa26efa2 ↵Bob Badour
am: 047a9dc178 am: f78070052d am: 1a7287122f Change-Id: I4dd90b19f2e9915acacc3d72fe76f738d21e5037
2020-03-26Remove redundant NOTICE copied from LICENSE. am: d06c42c400 am: fcfa26efa2 ↵Bob Badour
am: 047a9dc178 am: f78070052d Change-Id: Ie686eae7174cfc68a2834ac50d33240eab6cb155
2020-03-26Remove redundant NOTICE copied from LICENSE. am: d06c42c400 am: fcfa26efa2 ↵Bob Badour
am: 047a9dc178 Change-Id: Iec4500dec66a43248f7695c032201effe04c889f
2020-03-26Remove redundant NOTICE copied from LICENSE. am: d06c42c400 am: fcfa26efa2Bob Badour
Change-Id: I1f068831e58cd110377775c372646cab492bd157
2020-03-26Remove redundant NOTICE copied from LICENSE. am: d06c42c400 am: fcfa26efa2Bob Badour
Change-Id: I6c1fed81b9d92d55909f418c122254d59f1699fb
2020-03-26Remove redundant NOTICE copied from LICENSE. am: d06c42c400Bob Badour
Change-Id: I58bf28ab9d45cc7f7ee6fc1724817aa246149dec
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 21:12:45 +0000