summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-11Snap for 6001391 from 409af215603faf242cfa66d61125b7f40e32e69f to ↵q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11q_tzdata_aml_297100000android12-mainline-tzdata-releaseandroid10-mainline-tzdata-releaseandroid10-android13-mainline-tzdata-releaseandroid-build-team Robot
qt-aml-tzdata-release Change-Id: Ia77bf868f0d3ce6095450b718ba53f5197d9afaa
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: 5afedc6761 Change-Id: I6aede28da98e91690da7f315c3b3d9002b09860b
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: Ibbe93981267dd85b809e8a5f45303ce9544249db
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 6f55a2fd6d -s ours am: 5ff81509ee -s ours am skip reason: change_id Ia589938a885c0bd776d79955bc7c9fb56090808a with SHA1 dbd18c91f2 is in history Change-Id: I391f572f505c1e405c5c275c7444702a08a5f841
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 6f55a2fd6d -s ours am skip reason: change_id Ia589938a885c0bd776d79955bc7c9fb56090808a with SHA1 dbd18c91f2 is in history Change-Id: I585617de27cab1352d0db0e0a297cd67f50828b2
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I0c80e77459d16d9238d7b12978efe35635a94f2e Merged-In: Ia589938a885c0bd776d79955bc7c9fb56090808a
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
dbd18c91f2 -s ours am: 9b822c8914 am: 976d7f98cb Change-Id: Ib311b1f794beec1748d7efe03546edad7bee9c98
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
dbd18c91f2 -s ours am: 9b822c8914 Change-Id: Ia0dca7b87c6d8ebc08d7ec99d2aa2ad3119ce0bd
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: dbd18c91f2 -s ours am skip reason: subject contains skip directive Change-Id: I8569823cf8bb251ecacebc31d92a83010afe8be9
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Ia589938a885c0bd776d79955bc7c9fb56090808a
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: f192647bf1 -s ours am: ada790d8bb -s ours am: 8d4550b26c Change-Id: I5d0be9d0ff9181a12de3da0f4c3e2a52fb9d3c8e
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190705.004) into master am: f192647bf1 -s ours am: ada790d8bb -s ours am skip reason: subject contains skip directive Change-Id: I1b09e82bf698019921bbe9c270bd3f3576457eed
2019-07-09[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵temp_140451723Xin Li
(PPRL.190705.004) into master am: f192647bf1 -s ours am skip reason: subject contains skip directive Change-Id: Ia9a00348da5e4d1579e25628afc1c687af575897
2019-07-09DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterandroid-o-mr1-iot-release-1.0.14Xin Li
Bug: 136196576 Change-Id: I010ac50e503347465f2794e4815b59efd2b575de
2019-07-08Snap for 5622519 from 6bd88a2e0d1172b59c5db53726a6307f85a0aa67 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I644bca6098b1548a1610b549f81a431a2a493def
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 41955ef38f Change-Id: I42c14b6ece26311a9582fd7ed1288d8559491a1a
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I3d65b8e6e1433ae0c4519485aa5152472a1ae823
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: a4f5846929 -s ours am: 9ee330c353 -s ours am: 4576b8e70f Change-Id: I1759777bb2977175163fe8049560f300d187d1cd
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: a4f5846929 -s ours am: 9ee330c353 -s ours am skip reason: subject contains skip directive Change-Id: I3b9e0ccc5f86b41d7e04796fbf5d7aa2d191c4f0
2019-05-16[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.190505.001) into master. am: a4f5846929 -s ours am skip reason: subject contains skip directive Change-Id: Ib0863dd6d9daee6f1a28c76cc824e15bc21bb355
2019-05-16[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 7d4e6ae98e -s ours am: cc6cb14950 Change-Id: Ibd6f12462a6de86f529271aecfdbada76214ded3
2019-05-15[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190505.001) into stage-aosp-master am: 7d4e6ae98e -s ours am skip reason: subject contains skip directive Change-Id: Ifba9dbd005b9bfdb96dcf5f1e17bc03861feebc4
2019-05-15DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.android-o-mr1-iot-release-1.0.13Xin Li
Bug: 132622481 Change-Id: Iad0582cf5744ee4e62af7ffed97a22ac43daf6a9
2019-05-13DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into ↵temp_b_132622481_stage-aosp-masterXin Li
stage-aosp-master Bug: 132622481 Change-Id: I60b4f6474c665bc04fea1d37b32b73b1d99ac756
2019-05-07Snap for 5450365 from 1d756f8a9d5046c4e6e8ba36025e98bfb2964ce0 to ↵android-build-team Robot
pi-platform-release Change-Id: Ic7fb390fef4b75676faf8e54e3e86191fad6edad
2019-02-27Snap for 5339334 from 353ccfdf8158877a5f5295a2498a1022d065d894 to ↵android-9.0.0_r46android-9.0.0_r44android-9.0.0_r43android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releaseandroid-build-team Robot
pi-qpr3-release Change-Id: Ibf7e1c89afa169a1838a92e55a32913af5127d63
2019-02-26Snap for 5335558 from 353ccfdf8158877a5f5295a2498a1022d065d894 to ↵android-9.0.0_r47android-9.0.0_r45android-9.0.0_r42pie-qpr3-b-releaseandroid-build-team Robot
pi-qpr3-b-release Change-Id: Ia6cf4a1ea2c7005270deaf2afbfe90543f375777
2019-02-25Track RulesManagerService frameworks/base changes am: da40e61fe0 am: 5ba3f1622dandroid-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_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-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-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseNeil Fuller
am: 5309ca83a4 Change-Id: I2ba5ee17ea9317abbb942f8174d0395fb62a3115
2019-02-25Track RulesManagerService frameworks/base changes am: da40e61fe0Neil Fuller
am: 5ba3f1622d Change-Id: Ie0d80839204a9acd6bfb1e1ce3945efb6176fca3
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into ↵Xin Li
stage-aosp-master am: e4cd8fe5e0 -s ours am: dc832d6481 -s ours am skip reason: subject contains skip directive Change-Id: Iade3c17a904c93fe80af71962635d0a36012d5d0
2019-02-25[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: e4cd8fe5e0 -s ours am skip reason: subject contains skip directive Change-Id: I0d99437a0509e236b403606706178914802f4fb3
2019-02-22Track RulesManagerService frameworks/base changesNeil Fuller
am: da40e61fe0 Change-Id: Ifbbf95e5966aa61336e60955e563b8967973f31b
2019-02-21[automerger skipped] Import translations. DO NOT MERGE am: 353ccfdf81 -s oursBill Yi
am: ef1964d9a8 -s ours am skip reason: subject contains skip directive Change-Id: Ic6e4c0d10256b4ffe06d709c53fd8343b01cb356
2019-02-21[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 353ccfdf81 -s ours am skip reason: subject contains skip directive Change-Id: Iaa97451b21cb2cab55a207c49dcc9c0bf6a8d577
2019-02-20Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ib09f7e612ba0e43e9b6ec4f5368a7f52c4f36a1d
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Id53a9baa0512f4c5eb8381d20823fad61dada78d
2019-02-18Track RulesManagerService frameworks/base changesandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseNeil Fuller
Required to support RulesManagerService changes in frameworks/base. Bug: 119293618 Bug: 113373927 Test: See related frameworks/base/ change. Change-Id: I92174b839d3ee940bdc05296806575b2fae3cf86
2019-02-08Import translations. DO NOT MERGEBill Yi
Change-Id: Id10c7ae52ac85bb69c5a9f75e0e7c35accef02e7 Auto-generated-cl: translation import
2019-01-22Add default code reviewers into OWNERS am: 5088ee920b am: a8f5bcb40eChih-Hung Hsieh
am: 90410ab4a4 Change-Id: Ib367d299672e781b2f56beeb29afe13bcdd6a906
2019-01-22Add default code reviewers into OWNERS am: 5088ee920bChih-Hung Hsieh
am: a8f5bcb40e Change-Id: Iff94b5f90fab79166ffd4ecbaa3a8dbb3c7348f5
2019-01-22Add default code reviewers into OWNERSChih-Hung Hsieh
am: 5088ee920b Change-Id: I43f164c6325fb39a59161067fdc384b9883d80e3
2019-01-22Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: If9369898ce1ac875371d0c8a34da2b22e999ccc7
2019-01-15Convert Android.mk file to Android.bp am: 08d29a864c am: af7367aac9Sasha Smundak
am: 02d7412151 Change-Id: I8daf988a769eae39290b5201d3738eddd84498ed
2019-01-15Convert Android.mk file to Android.bp am: 08d29a864cSasha Smundak
am: af7367aac9 Change-Id: Ie67c2aa0d69c48de78cd8d5b4c820f5a221eb348
2019-01-15Convert Android.mk file to Android.bpSasha Smundak
am: 08d29a864c Change-Id: I8e4de010bf137c5247bbe9d002fe5e0575f51569
2019-01-13Convert Android.mk file to Android.bpSasha Smundak
See build/soong/README.md for more information. Change-Id: I221bd3d88449adf66f95e0d372984a2a0a426846 Fixes: 122333678 Test: treehugger
2019-01-12Import translations. DO NOT MERGEBill Yi
Change-Id: Idded9c387edeafc1c437f35d19a30213a7ff6f7a Auto-generated-cl: translation import
2018-12-29[automerger skipped] Import translations. DO NOT MERGE am: 2431ae42c7 -s oursBill Yi
am: 1bdd08941a -s ours Change-Id: I3084bcb0f5864bb948d269f4f7f8dea63a7fa551
2018-12-29[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 2431ae42c7 -s ours Change-Id: Ie210e68d41ee919a558d8c364c17a2b85546e897
2018-12-29Import translations. DO NOT MERGEpie-b4s4-devBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic235f9a01a9879808469618910b311114e6f5642
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 17:09:09 +0000