aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵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_r9android-11.0.0_r8android-11.0.0_r7android-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_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 2d2c9d6d38 am: bc071c31d8 -s ours am skip reason: subject contains skip directive Change-Id: Idc0dde05c9263cf70945e75e5b1a753c97f85874
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: 2d2c9d6d38 Change-Id: Icf41de8801562ac5adeb1243ea2cf3e3c5fc60d7
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: Ief0a1220355a1fce83a79158a9c0b6a03ba81f00
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 22e56c45d6 -s ours am: f00684d330 -s ours am: 393cb7b8e4 -s ours am skip reason: change_id I1088cf8188a276eff855101ff3ee6354ef93ec3b with SHA1 eaf930ea2b is in history Change-Id: Ic3b50187cda07501b16968cc9f3da239c6afcb72
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 22e56c45d6 -s ours am: f00684d330 -s ours am skip reason: change_id I1088cf8188a276eff855101ff3ee6354ef93ec3b with SHA1 eaf930ea2b is in history Change-Id: I9cbb05667cd2e5e2620c47bd1e5a08cdb11e4e9b
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 22e56c45d6 -s ours am skip reason: change_id I1088cf8188a276eff855101ff3ee6354ef93ec3b with SHA1 eaf930ea2b is in history Change-Id: Ib5d7d6ea78abaa1b047a001291a0c4e1a10111aa
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: If621628088df1247aed8297f50d67093c15eed73 Merged-In: I1088cf8188a276eff855101ff3ee6354ef93ec3b
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
60a08a3835 -s ours am: 0b6d055c88 am: 54204c9599 am: 60a5fe5c10 -s ours am skip reason: subject contains skip directive Change-Id: I8e02bde06f36983d7d378c81a4e2beebd4ffc70d
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
60a08a3835 -s ours am: 0b6d055c88 am: 54204c9599 Change-Id: I3b8b0aad99e1d3b6d870e0cb0089930e1e800ff1
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
60a08a3835 -s ours am: 0b6d055c88 Change-Id: I81662ff819a9b633b66323d51c54dc13f062b8e1
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 60a08a3835 -s ours am skip reason: subject contains skip directive Change-Id: Ie4f7c7bdc4e93df3bca26bc33ecf94cecd484eb4
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: I1088cf8188a276eff855101ff3ee6354ef93ec3b
2019-07-10[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master" am: 0827cdb90d -s ours am: 843df587b4 -s ours am: 25a8c28cbd am: 5e8b2c43df -s ours am skip reason: subject contains skip directive Change-Id: Ida6e544308244aaf6bbc1d0c75a81b5661243bc2
2019-07-10[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 448f04f0ba -s ours am: eede2dc02f -s ours am: 38df9bcb37 am: bbdeae00aa -s ours am skip reason: subject contains skip directive Change-Id: I95fa90047816be65d83767e46bf179d108343851
2019-07-10[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master" am: 0827cdb90d -s ours am: 843df587b4 -s ours am: 25a8c28cbd Change-Id: Ibba528a2b179a9cb1127ab48cddc4b31667ca427
2019-07-10[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 448f04f0ba -s ours am: eede2dc02f -s ours am: 38df9bcb37 Change-Id: I53aa353d24fec7951b5dfb6cbec39500122b6bfb
2019-07-10[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master" am: 0827cdb90d -s ours am: 843df587b4 -s ours am skip reason: subject contains skip directive Change-Id: Ifa213ada68a2c6b2a8fcf5b0a4d6f7087759199b
2019-07-10[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵temp_140451723Xin Li
(PPRL.190705.004) into master" am: 0827cdb90d -s ours am skip reason: subject contains skip directive Change-Id: I7aff22755ba41b9e0d1eec29036b12132c3d90ec
2019-07-10[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 448f04f0ba -s ours am: eede2dc02f -s ours am skip reason: subject contains skip directive Change-Id: Ib75d9ae6b424ce7cae92335c60e28bf467b09578
2019-07-10[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: 448f04f0ba -s ours am skip reason: subject contains skip directive Change-Id: I517036410d3fe09cc0f2756ce769ae5b41223f73
2019-07-11Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"android-o-mr1-iot-release-1.0.14Treehugger Robot
2019-07-09DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterXin Li
Bug: 136196576 Change-Id: I1792662b74e0682d162babfd151f07dfc0063edc
2019-07-08Snap for 5622519 from 60d48c6ad0a7998ee46880e5b6aaa6a52d971886 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: Ic62dcf2ad37cb0f649a771e1711a3ee98e1805bf
2019-07-08Snap for 5600800 from ae2f2db5e0e961441be3545878b1c3be7de1f1c5 to ↵android-build-team Robot
pi-platform-release Change-Id: Ic54cb5555fb2ccaabde4081729891842d9b43ad2
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: a8967929fa am: 8c35d0bfdf -s ours am skip reason: subject contains skip directive Change-Id: Ib8acdb3513b28640f540fc7354d5aa85e7d76448
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: a8967929fa Change-Id: I1b7fa65c1275d717386946254c0c61844524530f
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I5b6cef149f883367f9238225239033f5c34e476b
2019-06-24Merge "Switch host variant to using ICU direct" am: 914fafd798 am: ↵Neil Fuller
3403333ae2 am: 18749cd7ca am: 2e25a1fe3c Change-Id: I2caaafdeb59769ec9334a5e055fc400a682f81e5
2019-06-24Merge "Switch host variant to using ICU direct" am: 914fafd798 am: 3403333ae2Neil Fuller
am: 18749cd7ca Change-Id: I9d3cb970912506a372463808069c27b5f7d8329c
2019-06-24Merge "Switch host variant to using ICU direct" am: 914fafd798Neil Fuller
am: 3403333ae2 Change-Id: If5ad8ca3d8e75a37893d02c242f7aa1d81fd11e1
2019-06-24Merge "Switch host variant to using ICU direct"Neil Fuller
am: 914fafd798 Change-Id: I263f32b95bd379b80e8fdabf4ed96d0377c32d0d
2019-06-24Merge "Switch host variant to using ICU direct"Neil Fuller
2019-06-21Switch host variant to using ICU directNeil Fuller
Switch host library variants to using ICU direct; libandroidicu should only be used on device. Bug: 130787951 Test: build only Change-Id: I6abd00fbe8c8380a8df597107d6028eff82d58da
2019-05-15Merge cherrypicks of [7513497, 7518418, 7517880, 7517881, 7517882, 7517883, ↵android-9.0.0_r47android-9.0.0_r45pie-qpr3-b-releaseandroid-build-team Robot
7517884, 7517885, 7517886, 7517956, 7517957, 7518438, 7518102, 7517887, 7518141, 7518142, 7518143, 7518144, 7517888, 7517889, 7517890, 7517891, 7518439, 7518440, 7518441, 7518442, 7518443, 7518029, 7518104, 7517892, 7517893, 7518061, 7518444, 7517894, 7517895, 7518030, 7518031, 7518445, 7517896, 7517969, 7517897, 7518105, 7518145, 7518146, 7518446] into pi-qpr3-b-release Change-Id: Id0da1e63827b02771b0db7f411804e5a2dd2cb71
2019-05-15Fix uninitialized value in sfntlyHaibo Huang
Bug: 116114182 Test: build Change-Id: Ief84dd8a19bdb461945e07504270be76a3545701 Merged-In: Ief84dd8a19bdb461945e07504270be76a3545701 (cherry picked from commit 51ecc82faa63aacdde6648f80a3898b53653da78)
2019-05-14Merge cherrypicks of [7496339, 7495273, 7495624, 7496340, 7496341, 7496342, ↵android-9.0.0_r46android-9.0.0_r44android-9.0.0_r43pie-qpr3-releaseandroid-build-team Robot
7496343, 7495658, 7494789, 7494790, 7494791, 7496344, 7496345, 7496346, 7496347, 7496574, 7496348, 7496575, 7496576, 7496260, 7496349, 7496350, 7496440, 7496577, 7496578, 7496261, 7495625, 7496442, 7496351] into pi-qpr3-release Change-Id: I0ddc03a2113226a4e86a84370ef36345c2afd3e5
2019-05-14Fix uninitialized value in sfntlyHaibo Huang
Bug: 116114182 Test: build Change-Id: Ief84dd8a19bdb461945e07504270be76a3545701 Merged-In: Ief84dd8a19bdb461945e07504270be76a3545701 (cherry picked from commit 51ecc82faa63aacdde6648f80a3898b53653da78)
2019-05-09resolve merge conflicts of adc5927a693a03e8710ea4bb627f81855fe81ab2 to ↵Haibo Huang
qt-dev-plus-aosp am: 9d076a5b24 Change-Id: I7f752ae46ce7250f2fd6357badba66822d4d90ac
2019-05-09resolve merge conflicts of adc5927a693a03e8710ea4bb627f81855fe81ab2 to ↵Haibo Huang
qt-dev-plus-aosp Bug: 116114182 Test: I solemnly swear I tested this conflict resolution. Exempt-From-Owner-Approval: Solve merge conflicts Change-Id: I079c392a848a687cf74a7063d47c4dc3fbd0486c
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseHaibo Huang
am: c64dc4a855 am: 2c01aa0267 am: d638e6ac77 am: ac79a58027 am: f96cdf438c am: 536775e8a1 am: 9abde61579 Change-Id: I6b75c1490e0047d4c07949d2becf22bf39146018
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵Haibo Huang
am: c64dc4a855 am: 2c01aa0267 am: d638e6ac77 am: ac79a58027 am: f96cdf438c am: 536775e8a1 Change-Id: I2820a94e209764e62ac2130406d5d5f5b98e29f6
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵Haibo Huang
am: c64dc4a855 am: 2c01aa0267 am: d638e6ac77 am: ac79a58027 am: f96cdf438c Change-Id: Ib1cc2170d2f7b8a4423e398ee5f1e405cb090718
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵Haibo Huang
am: c64dc4a855 am: 2c01aa0267 am: d638e6ac77 am: ac79a58027 Change-Id: I074195e0023175cc5be615502b2330fbd50b6fe7
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵Android Build Merger (Role)
am: c64dc4a855 am: 2c01aa0267 am: d638e6ac77 Change-Id: I8f91e04a111dd2518b6d71bed43e6f490b5af034
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵Android Build Merger (Role)
am: c64dc4a855 am: 2c01aa0267 Change-Id: I6b66582a54331f91bcbec36a16610b3346e52b94
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554f ↵Android Build Merger (Role)
am: c64dc4a855 Change-Id: I72631c1172e74b42549c1cbd14254e1c09ee44e4
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faa am: 82d147554fAndroid Build Merger (Role)
Change-Id: I911ba753ebbf9e35ef5f8789a6af802e77c6566d
2019-05-08[automerger] Fix uninitialized value in sfntly am: 51ecc82faaAndroid Build Merger (Role)
Change-Id: I73fc78bb76d931176d5d90858c983cfb8484b6a3
2019-05-08Fix uninitialized value in sfntlyHaibo Huang
Bug: 116114182 Test: build Change-Id: Ief84dd8a19bdb461945e07504270be76a3545701 Merged-In: Ief84dd8a19bdb461945e07504270be76a3545701
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 07:59:37 +0000