aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-08Skip ab/6749736 in stage.Xin Li
Merged-In: I560a46d6ed8b834196b06f3bdeb29466ca500af7 Change-Id: If00f0d2024c785746835e3063f3e0a5ca1376c15
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-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 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 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 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 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
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75Rod S
Change-Id: I2df71cec8c0802830b963c4f070e23caa70a0af0
2020-03-20Merge "Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75" ↵Automerger Merge Worker
into rvc-d1-dev-plus-aosp
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: cf7fa66af9Rod S
Change-Id: I9fd2b7bd4a31aa03b28f65b6d53fe969b43bce01
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fc am: 8ac9f1ed75Rod S
Change-Id: I03060c99793cf420acf1e6fd76d920432deea593
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fcRod S
Change-Id: I38be7bb785d0712c01fb1f7cdccd9a5c22701527
2020-03-20Update Unicode files to Unicode 13 am: e0f2a682fcandroid-11.0.0_r16android11-d1-b-releaseRod S
Change-Id: I49f7d3ef4b5ec6975dd1e3a61cefa61145dba043
2020-03-19Update Unicode files to Unicode 13android-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_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_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-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_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_r12android11-mainline-tethering-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-devRod S
Test: None. Bug: 151964652 Change-Id: Ia603dff1feffbcbbe645f657abd6102bbc837ddb (cherry picked from commit fe6b85cde7d7d8694b08c2b3c732693e61ff1d3e)
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3c5c0e2464 -s ours am: 58538160f2 am: a938f8b495 Change-Id: I40e6cc4e6069f4af75ebfe5ee6c9ae404d3cbc6e
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3c5c0e2464 -s ours am: 58538160f2 Change-Id: I9decd26fc78f66fde5d5cacc9c912b2aba2b1e98
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: 3c5c0e2464 Change-Id: Idb9b64ec1a86151b937e9a2d6025e732ca0683e3
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 3c5c0e2464 -s ours am skip reason: subject contains skip directive Change-Id: If90fd597fcb4c6a9a64ee8637fa9213bf3f23772
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ie9af940bfa6ed9d06ce0bd9b2c8f47a1b4225871
2020-03-06[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT ↵Automerger Merge Worker
MERGE" am: 76611169d1 am: d384a571e0 -s ours am: d7c4cd00a5 am: 5d4bb6597f Change-Id: Ibfbfd355b46ed6154bf2abd9e0fe936657e4a547
2020-03-06[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE ↵Automerger Merge Worker
am: 0b20a8a314 am: 02f2a08ab2 -s ours am: 1ef2981b5c am: d6b5e26128 Change-Id: If45b1ae4a6894d0412e57df55ddb8fa6a8b2ea0c
2020-03-06[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT ↵Automerger Merge Worker
MERGE" am: 76611169d1 am: d384a571e0 -s ours am: d7c4cd00a5 Change-Id: Ibb6514661627c245c363024030d2ba5f816d652e
2020-03-06[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE ↵Automerger Merge Worker
am: 0b20a8a314 am: 02f2a08ab2 -s ours am: 1ef2981b5c Change-Id: Icc7f1222d9af3c8dc619910256b48e9ea718e5b0
2020-03-06Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 76611169d1 ↵Automerger Merge Worker
am: d384a571e0 Change-Id: I54f6eed3e6898ae70d9e7c15c07910acfadf82f5
2020-03-06Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 0b20a8a314 am: ↵Automerger Merge Worker
02f2a08ab2 Change-Id: I789a0c904c81ee9d616e89192e4e61ef360ae65a
2020-03-06[automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT ↵Automerger Merge Worker
MERGE" am: 76611169d1 am: d384a571e0 -s ours am skip reason: subject contains skip directive Change-Id: I925b6d4f5208505d7222bfaccfdb8e8e090bdf76
2020-03-06[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE ↵Automerger Merge Worker
am: 0b20a8a314 am: 02f2a08ab2 -s ours am skip reason: subject contains skip directive Change-Id: Icb94b2f1eade56ae46dc73b24ed2353d822ff161
2020-03-06Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 76611169d1Automerger Merge Worker
Change-Id: I6ace3f711c64e149573fc9693b288ba73ef4ae91
2020-03-06Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 0b20a8a314Automerger Merge Worker
Change-Id: I0bf11b0736abf14664ee09bbbaef595fb4056343
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 14:37:49 +0000