aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 5e5f93d8c4 -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: Ib13266b4afc05a11aaeb832f660bab8e7f486f10
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I9aa34c701c165c4b37ff580a0c70668f8665e7f8 Change-Id: Ibc9182f24b151d65d15559af96a2039cf076d380
2020-04-29Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6a am: ↵Treehugger Robot
14a6c6a89c am: e0eeaa6f66 am: 35d7caa190 am: d22dfcde8c Change-Id: Ibc89ea8242768c1d9e75143cac39c6f4101ed0cc
2020-04-29Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6a am: ↵Treehugger Robot
14a6c6a89c am: e0eeaa6f66 am: 35d7caa190 Change-Id: I20980183bc10a9452121e60bbe1ff4148148c11e
2020-04-29Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6a am: ↵Treehugger Robot
14a6c6a89c am: e0eeaa6f66 Change-Id: I560a46d6ed8b834196b06f3bdeb29466ca500af7
2020-04-29Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6a am: ↵Treehugger Robot
14a6c6a89c Change-Id: I9aa34c701c165c4b37ff580a0c70668f8665e7f8
2020-04-29Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE" am: feb5dbfc6aandroid-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I421b49bb362bd3d3e1d51b12bc9f656c0735fe0e
2020-04-29Merge "Add METADATA to unicode: UNICODE+MIT=NOTICE"Treehugger Robot
2020-04-28Add METADATA to unicode: UNICODE+MIT=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I1484515278d797c5480703a892e33f0763d0fb92
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 207dbf14d4 -s ours am: 7d020d893b am: 0a4770f774 am: 674ac29f43 -s ours am skip reason: subject contains skip directive Change-Id: I2648affd9ddf802fd2b95d06fe92983e003c4eda
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 207dbf14d4 -s ours am: 7d020d893b am: 0a4770f774 Change-Id: I3960e132aaa65a2e00c21cfe046797563a0f42a2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 207dbf14d4 -s ours am: 7d020d893b Change-Id: Ide6aadcb81218f1490799383eb98c713e4c9fe60
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 207dbf14d4 -s ours am skip reason: subject contains skip directive Change-Id: If5eff91148d4a4933a6a740da0e76d3c52f8e974
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ib81b36529a674d3552f16c7745fb6c13e4de5408
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75 am: ↵Rod S
a367eff9b7 am: 563fb8a0d5 am: 0767081a48 Change-Id: I840dd27f3181a461f87af260d546a486e7ee9dd4
2020-03-20Merge "Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75" ↵Automerger Merge Worker
into rvc-d1-dev-plus-aosp am: 87bcb2b402 am: d790ac0efb Change-Id: If4444f218bfb7aed9704b23186de2828a1663f64
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: cf7fa66af9 am: ↵Rod S
5e4f55e739 am: 03356dd83d Change-Id: I6aabe8835b226d096674df81fd4546f7fc3bc679
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75 am: ↵Rod S
a367eff9b7 am: 563fb8a0d5 Change-Id: Ib345d73bb1d78668deee354fcab63a593ae9a96a
2020-03-20Merge "Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75" ↵Automerger Merge Worker
into rvc-d1-dev-plus-aosp am: 87bcb2b402 Change-Id: I68850d9a7f52b19ed37c8be7d6b10b013ee83fc0
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75 am: a367eff9b7Rod S
Change-Id: I8fbf13a15492a7d88ee7f1e9fe080fb51019a2ce
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: cf7fa66af9 am: 5e4f55e739Rod S
Change-Id: I4177b918551501faa65d0ab514e9cc8c9ac03aee
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 19:34:01 +0000