summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-21Merge "Snap for 5590161 from 7dc8a3975b6d2f5f714dfef46efdc209af683757 to ↵simpleperf-releaseandroid-build-prod (mdb)
simpleperf-release" into simpleperf-release
2019-05-21Snap for 5590161 from 7dc8a3975b6d2f5f714dfef46efdc209af683757 to ↵android-build-prod (mdb)
simpleperf-release Change-Id: I860e75f8850111622fc86ed51612962e74f96c6b
2019-05-17Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master."HEADandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13mastermainXin Li
2019-05-15DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.Xin Li
Bug: 132622481 Change-Id: Ie0c4fce7d6383122803a1b65dbb0008f6009f870
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: I396a6d1d8f47348932b1a15790c98eb1f5913dbe
2019-05-09[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li
am: 4536a039a2 -s ours am skip reason: subject contains skip directive Change-Id: I163d0b0196667ae6966fc840e92c1085d9ac3999
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
am: c48d18d5d1 -s ours am skip reason: subject contains skip directive Change-Id: I7ef4d43e2861f88387bc4c5acb7fdf007fe0337a
2019-05-09Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."Xin Li
2019-05-09DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
Bug: 131756210 Change-Id: I930286ba407e62a43ddb1b798322353ea9c85f05
2019-05-07Snap for 5450365 from 9cae09cda97305ed0f613385e4d569ac9246cd51 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: Ib4d246d660989bc81fb940e06ea809d9af6ecfe5
2019-04-18Merge "Fix incorrect leap year logic"temp_b_131756210_stage-aosp-masterNeil Fuller
am: 3a72cde42c Change-Id: I1ab2acbd2c0b78fdfdaf95c0fffc137a1b2cce0c
2019-04-18Merge "Fix incorrect leap year logic"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-04-17Fix incorrect leap year logicNeil Fuller
Fixing an issue for 2100. Bug: 28784177 Test: build only Change-Id: I7fc324445c79c881994cfdded9685c156efe5538
2019-04-13[automerger skipped] Merge "Import translations. DO NOT MERGE"Bill Yi
am: b38a37cb1c -s ours am skip reason: subject contains skip directive Change-Id: I22f3f56acba504247a46b74d32e165b04dceac7f
2019-04-13Merge "Import translations. DO NOT MERGE"Treehugger Robot
2019-04-13Import translations. DO NOT MERGEBill Yi
Change-Id: I0e8bb276b508ca77a4386bf3e00726e75cf19be6 Auto-generated-cl: translation import
2019-02-21DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Id60223f3f375d6d351c72f36fb6783c1c26b29ec
2019-02-20Snap for 5322077 from ad1233e57373d9bd8052ca5823ddfe2ce35874a5 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: Ia9569cb7691c87a4c316c3a17803452bf06b8d2d
2019-02-19Merge "Migrate datetimepicker to androidx."Aurimas Liutikas
am: 715fe1d09d Change-Id: Ibfb2bb86bb794cb5a526f7bfda56c1c5b3da993d
2019-02-19Merge "Migrate datetimepicker to androidx."android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Treehugger Robot
2019-02-17Import translations. DO NOT MERGEandroid-9.0.0_r47android-9.0.0_r45android-9.0.0_r42pie-qpr3-b-releaseBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I1aadc6b2d8a725476d8a0e73618423230689b394
2019-02-15Migrate datetimepicker to androidx.Aurimas Liutikas
Test: make android-opt-datetimepicker Bug: 76692459 Change-Id: Idebb7294c44d7f63557d1690e221f39bacba36d3 Merged-In: Idebb7294c44d7f63557d1690e221f39bacba36d3
2018-12-28[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 7c3dfde4a4 -s ours Change-Id: I217051b251383ce205ef5f23ae4d6f0f83668543
2018-12-28Import translations. DO NOT MERGEpie-b4s4-devBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I3234f128d5212fc6c609650410e5880297056369
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: d74021df6b -s ours am: 33ed6ab42f -s ours Change-Id: I5aa817705ade6870ce722bb6db9a4c0ae16adeb9
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: d74021df6b -s ours Change-Id: Ica4a8cca9fa4bb3a23cb1c4238e51efdf9a5f98c
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-releaseBill Yi
Change-Id: I68a91d6b9510a70f5ac4047d12630eef83f367c1
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: e94411bdf7 -s ours Change-Id: I22426a1c36709f9772debe40374238f8ea895ecb
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I0704c99160f99ba60053bb5c842faa8b71d71359
2018-10-13[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 9d48e924be -s ours Change-Id: I4ffc73d9a98db7fe917fe4db0518fdfce70b2b1b
2018-10-13Import translations. DO NOT MERGEBill Yi
Change-Id: I2a3ee4d3b8a16a689e8bda0e0576b1e9866b547d Auto-generated-cl: translation import
2018-08-17Merge "Convert frameworks/opt/datetimepicker to Android.bp" am: 9668ecd8bdColin Cross
am: 9c31572f2f Change-Id: Iea5eb9eae2e5736eef5c12e323a78210d7ab5db6
2018-08-17Merge "Convert frameworks/opt/datetimepicker to Android.bp"Colin Cross
am: 9668ecd8bd Change-Id: I5b27e7f7235585e619c4a8ad47d52546d11e3945
2018-08-18Merge "Convert frameworks/opt/datetimepicker to Android.bp"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseTreehugger Robot
2018-08-18Convert frameworks/opt/datetimepicker to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I90f3f8dc44f41c802fc0e8e6c3af0bb8bc6fa077 Merged-In: I90f3f8dc44f41c802fc0e8e6c3af0bb8bc6fa077 (cherry-picked from commit 6fe5a713b7c0fc2b2b1134dfeba98801ccb2a5c1)
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
am: e29d8b5a16 Change-Id: I501112ef037414f6b757bd5d4f532a59175e2c36
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
Bug: 112535855 Change-Id: I0df5b461c2b55fe4467fad577afd0be08a912c32
2018-08-07Merge "Merge Android Pie into master" am: b3f02da5bd am: d2c8567069Xin Li
am: 8d9881c525 Change-Id: I19a155eaf54f984d70fc51b7568b5f0feb7224cd
2018-08-07Merge "Merge Android Pie into master" am: b3f02da5bdXin Li
am: d2c8567069 Change-Id: I607606dc105ba5064f0f84be981c15c8a5cee381
2018-08-07Merge "Merge Android Pie into master"Xin Li
am: b3f02da5bd Change-Id: I0979fb3a4f98ad4404c6e513fb436d386bea0426
2018-08-07Merge "Merge Android Pie into master"android-o-mr1-iot-release-1.0.3Xin Li
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: I6b4ff3c2b74d83ea2d53516a0a99a349661f5c07
2018-08-04[automerger skipped] Import translations. DO NOT MERGE am: 790c343176 -s oursBill Yi
am: d4e9e43089 -s ours Change-Id: I4746838df8aa9d2735eaad669a982bd6d2a241db
2018-08-04[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 790c343176 -s ours Change-Id: I098c501721069dcbfe8dcce5fbdf9ef7a00765f2
2018-08-04Import translations. DO NOT MERGEtemp_p_mergeBill Yi
Change-Id: Iabdfa6dde3f2b4c0626e5efefe096fa372ca055f Auto-generated-cl: translation import
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: c9c3978ea9 Change-Id: I2874add0282a2a6b01c773d15b23d192a999b2ff
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: I67d99e171885199c264c3139e9b976ec5efe085d
2018-06-04[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: cef97a724e -s ours Change-Id: Ib055e38af375767cc1399a0270fe03937dccbff1
2018-06-04Snap for 4818837 from cef97a724eedde195feec2d8249d3f48dc8ddea7 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-releaseandroid-build-team Robot
Change-Id: I72dde76c070a094539577ea1496cc454522fbde5
2018-06-02Import translations. DO NOT MERGEandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devpie-devBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ib32e06904e99435068fc4c770f294c9116c2438c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 16:44:01 +0000