aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: I80f56f9865672006130c1f29ada35321e02232aa Change-Id: I2bcfb1b49c7eeac905e7b7fed76325ed663a1cc9
2022-12-06Update Unicode emoji data to 15.0 am: d0d25b4d86Seigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/20108266 Change-Id: I8a62bf41d436c64de806e20b7d6ed47e1849a7b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05Update Unicode emoji data to 15.0android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseSeigo Nonaka
Bug: 249366652 Test: Manually done with demo app Change-Id: I80f56f9865672006130c1f29ada35321e02232aa Merged-In: I80f56f9865672006130c1f29ada35321e02232aa
2022-03-09[automerger skipped] Merge "Merge Android 12L" am: 05e8cf4309 -s ours am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16k-with-phonesmain-16kandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseXin Li
f377a8e5f7 -s ours am: 455b51fce3 -s ours am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316 Change-Id: I07b7dfa5a8cc19b97d70bb288c2e49049f930ac6
2022-03-09[automerger skipped] Merge Android 12L am: 9fc19c52b1 -s ours am: 07cbf5d668 ↵Xin Li
-s ours am: a6f19a7474 -s ours am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316 Change-Id: I0eabdfdde0c3e822fc46818008fc99c25c281892
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: 05e8cf4309 -s ours am: ↵Xin Li
f377a8e5f7 -s ours am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316 Change-Id: I7a748ccd06f298066d6c50623af463c15fcf7675
2022-03-08[automerger skipped] Merge Android 12L am: 9fc19c52b1 -s ours am: 07cbf5d668 ↵Xin Li
-s ours am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316 Change-Id: I6fdc3b1f47f4365a81fb20a56456eeee215b305f
2022-03-08[automerger skipped] Merge "Merge Android 12L" am: 05e8cf4309 -s oursXin Li
am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316 Change-Id: I28bb201fbe5b1d6cfcb614c50f647153a22628f5
2022-03-08[automerger skipped] Merge Android 12L am: 9fc19c52b1 -s oursXin Li
am skip reason: Merged-In I398c8b43735fbec40e9e36ececd94295795bec7d with SHA-1 72877cba9a is already in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/2013316 Change-Id: I0527c7f4c01fd4e51557401d987a139d7067308e
2022-03-08Merge "Merge Android 12L"Xin Li
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I398c8b43735fbec40e9e36ececd94295795bec7d Change-Id: Ie5d569ac881fb35bcfe4a6434f7f4d4910a7ef6e
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
72877cba9a -s ours am: bb95d7895f -s ours am skip reason: Merged-In I6443205361aaff30f2d03bb002535a7890afabb4 with SHA-1 1a4b894211 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/16845095 Change-Id: I54c86dd069ff6e1381a05d6106bcbb92cd68f692
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
72877cba9a -s ours am skip reason: Merged-In I6443205361aaff30f2d03bb002535a7890afabb4 with SHA-1 1a4b894211 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/16845095 Change-Id: I9569d8ec2fcad92b703e00b490c0e91c8aea9800
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I6443205361aaff30f2d03bb002535a7890afabb4 Change-Id: I398c8b43735fbec40e9e36ececd94295795bec7d
2021-09-24Update Unicode Emoji data am: 1a4b894211 am: e54dc1ce51Seigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/15897280 Change-Id: Icd2c2322f1e0fe44ab0a3d387dbeda8675ce4da0
2021-09-24Update Unicode Emoji data am: 1a4b894211Seigo Nonaka
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/15897280 Change-Id: I394f1904c737dbaeffc71fa1f4751d5eacbde4e1
2021-09-23Update Unicode Emoji dataandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseSeigo Nonaka
Bug: 199180630 Test: N/A Change-Id: I6443205361aaff30f2d03bb002535a7890afabb4
2021-09-20Update Unicode Emoji dataSeigo Nonaka
Bug: 199180630 Test: N/A Change-Id: I6443205361aaff30f2d03bb002535a7890afabb4
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I692539fc73e7fa46f17e16d248bd3210239118f5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f73cac2568 -s ↵Xin Li
ours am: bec3fc158c -s ours am: b2a55f4303 -s ours am skip reason: Change-Id I547e19057d0d784a1c57d929ac41135e3cbc3a1d with SHA-1 4900872960 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I647d1ece0bc7c91ed1480a091a00a4be304d78a7
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f73cac2568 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: bec3fc158c -s ours am: b2a55f4303 -s ours am skip reason: Change-Id I547e19057d0d784a1c57d929ac41135e3cbc3a1d with SHA-1 4900872960 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2b4716990e182fa3ac976fb01141badb686e33f5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f73cac2568 -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.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_r16android12-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: bec3fc158c -s ours am skip reason: Change-Id I547e19057d0d784a1c57d929ac41135e3cbc3a1d with SHA-1 4900872960 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I64dc5577a8cdf14962d278b9cbc40cfdb66ff95b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f73cac2568 -s oursXin Li
am skip reason: Change-Id I547e19057d0d784a1c57d929ac41135e3cbc3a1d with SHA-1 4900872960 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I790467f6686315cf66a20f0629a03bee01ea44a7
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: I547e19057d0d784a1c57d929ac41135e3cbc3a1d Change-Id: I7a0b3f5001fd673ab422a60867e069f397c17b71
2020-12-10[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: ↵Xin Li
fcee546744 -s ours am: de8c2397f1 -s ours am: 4900872960 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1520885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia477705d115b4aa8dc710e41da0d4efcf74a39d9
2020-12-10[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: ↵Xin Li
fcee546744 -s ours am: de8c2397f1 -s ours am skip reason: Change-Id Ia0b1c53b5b58c067e86805a34e358081831dc792 with SHA-1 b31d168b7e is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1520885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I547e19057d0d784a1c57d929ac41135e3cbc3a1d
2020-12-10[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: ↵Xin Li
fcee546744 -s ours am skip reason: Change-Id Ia0b1c53b5b58c067e86805a34e358081831dc792 with SHA-1 b31d168b7e is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1520885 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7b0e811236e1f772875b23fd8ce77ac3b1330cde
2020-12-10Merge "DO NOT MERGE - Merge Android R QPR1"android-s-preview-1Xin Li
2020-12-08DO NOT MERGE - Merge Android R QPR1Xin Li
Bug: 172690556 Merged-In: Ia0b1c53b5b58c067e86805a34e358081831dc792 Change-Id: Iae7bc0dab3c6bb3aad560377b9159ec8621fbd73
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
b31d168b7e -s ours am: 7be569bc67 -s ours am skip reason: Change-Id I7509b5d196ca241b2d80fcd801b7af94b749fb70 with SHA-1 cc1e8f5100 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/13121545 Change-Id: I5c52978ca978d46cacf3ca05850cb3fad08ae0fa
2020-12-03[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li
b31d168b7e -s ours am skip reason: Change-Id I7509b5d196ca241b2d80fcd801b7af94b749fb70 with SHA-1 cc1e8f5100 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/13121545 Change-Id: Ic44d3c3203b61b4af3bf04d7ae697b3cbfe28929
2020-11-23Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855temp_rvc_qpr_mergeXin Li
Bug: 172690556 Merged-In: I7509b5d196ca241b2d80fcd801b7af94b749fb70 Change-Id: Ia0b1c53b5b58c067e86805a34e358081831dc792
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 94fc9bc306 -s ours am: ↵Xin Li
2e392ce1e7 -s ours am: 9b467c506a -s ours am skip reason: Change-Id I560a46d6ed8b834196b06f3bdeb29466ca500af7 with SHA-1 35d7caa190 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12796089 Change-Id: Ic0dd24d23b76db1a19fd175a8df753b4ba71c86f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 94fc9bc306 -s ours am: ↵Xin Li
2e392ce1e7 -s ours am skip reason: Change-Id I560a46d6ed8b834196b06f3bdeb29466ca500af7 with SHA-1 35d7caa190 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12796089 Change-Id: I83b7e09af35eef78ddab92672d0661a04acecca3
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 94fc9bc306 -s oursXin Li
am skip reason: Change-Id I560a46d6ed8b834196b06f3bdeb29466ca500af7 with SHA-1 35d7caa190 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12796089 Change-Id: I8da7b7e724c1756022186c0b583805f415f0b5d7
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I560a46d6ed8b834196b06f3bdeb29466ca500af7 Change-Id: If00f0d2024c785746835e3063f3e0a5ca1376c15
2020-09-22Unicode Emoji 13.1 Data am: e6d48226be am: cc1e8f5100Siyamed Sinir
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12652634 Change-Id: If668c5a8f6f9895ca316d814341fa7ff40b1ff0a
2020-09-21Unicode Emoji 13.1 Data am: e6d48226beSiyamed Sinir
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12652634 Change-Id: I7509b5d196ca241b2d80fcd801b7af94b749fb70
2020-09-21Unicode Emoji 13.1 Dataandroid-11.0.0_r46android-11.0.0_r43android-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_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseSiyamed Sinir
Update unicode data for emoji 13.1 Test: m fontchain_lint Test: flash and check emoji list on Chrome Bug: 168648585 Bug: 169086551 Change-Id: Ieb5d57597e9b8e4473ed69c0d32edbb9440c456e
2020-09-20Unicode Emoji 13.1 DataSiyamed Sinir
Update unicode data for emoji 13.1 Test: m fontchain_lint Test: flash and check emoji list on Chrome Bug: 168648585 Change-Id: Ieb5d57597e9b8e4473ed69c0d32edbb9440c456e
2020-09-11[automerger skipped] Merge "Merge Android R" am: 89941a3637 -s ours am: ↵Xin Li
b27f13c337 -s ours am: cd7d690c9c -s ours am: 7839d76f66 -s ours am: dbac25ed75 -s ours am skip reason: Change-Id Ibc9182f24b151d65d15559af96a2039cf076d380 with SHA-1 5e5f93d8c4 is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1422363 Change-Id: Ieec142e047e6232adb54e9e575c75f75c1e95d1b
2020-09-11[automerger skipped] Merge "Merge Android R" am: 89941a3637 -s ours am: ↵Xin Li
b27f13c337 -s ours am: cd7d690c9c -s ours am: 7839d76f66 -s ours am skip reason: Change-Id Ibc9182f24b151d65d15559af96a2039cf076d380 with SHA-1 5e5f93d8c4 is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1422363 Change-Id: Ic9f13acdfcf9c5ac7f5278eee04f542148b78541
2020-09-11[automerger skipped] Merge "Merge Android R" am: 89941a3637 -s ours am: ↵Xin Li
b27f13c337 -s ours am: cd7d690c9c -s ours am skip reason: Change-Id Ibc9182f24b151d65d15559af96a2039cf076d380 with SHA-1 5e5f93d8c4 is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1422363 Change-Id: Id6d8f50a8361f121cf8480b53f5738c076fd4d43
2020-09-11[automerger skipped] Merge "Merge Android R" am: 89941a3637 -s ours am: ↵Xin Li
b27f13c337 -s ours am skip reason: Change-Id Ibc9182f24b151d65d15559af96a2039cf076d380 with SHA-1 5e5f93d8c4 is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1422363 Change-Id: Icbb4972f1358f215d77560d8873d0ae4b6a4a2ad
2020-09-11[automerger skipped] Merge "Merge Android R" am: 89941a3637 -s oursXin Li
am skip reason: Change-Id Ibc9182f24b151d65d15559af96a2039cf076d380 with SHA-1 5e5f93d8c4 is in history Original change: https://android-review.googlesource.com/c/platform/external/unicode/+/1422363 Change-Id: I5d65dba03a8dc6f55e6d651c0482bedc93989fe3
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Ibc9182f24b151d65d15559af96a2039cf076d380 Change-Id: I6d0e0c8cd9df40d16cf6abf0dccf3e23ca0eb24e
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 5e5f93d8c4 -s ours am: 0050cae03e -s ours am: ac5989a092 -s ours am: cd1964c24c -s ours am skip reason: Change-Id I9aa34c701c165c4b37ff580a0c70668f8665e7f8 with SHA-1 e0eeaa6f66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12470120 Change-Id: I5bd09a932ca8f4f7f8c1fe757a48a6656ec0ad62
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 5e5f93d8c4 -s ours am: 0050cae03e -s ours am: ac5989a092 -s ours am skip reason: Change-Id I9aa34c701c165c4b37ff580a0c70668f8665e7f8 with SHA-1 e0eeaa6f66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12470120 Change-Id: I6aeb9150a3da0b022078227fa9316ce36cd68ef2
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 5e5f93d8c4 -s ours am: 0050cae03e -s ours am skip reason: Change-Id I9aa34c701c165c4b37ff580a0c70668f8665e7f8 with SHA-1 e0eeaa6f66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/unicode/+/12470120 Change-Id: I0d5101fcbc3ed01fb04dedf651795d200de9bc4e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 16:55:21 +0000