aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-11[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into masterHEADandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13mastermainThe Android Open Source Project
am: 9b89e0add5 -s ours am skip reason: subject contains skip directive Change-Id: I0cd02a21190d89b7c1aa96c22a1ea4d2a03c3042
2019-03-11DO NOT MERGE - Skip PPRL.190305.001 into masterandroid-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-releaseThe Android Open Source Project
Bug: 127812889 Change-Id: I1f44c24a2499fe75a6db2302ff104eedca66144e
2019-02-21DO NOT MERGE - Skip pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I4972e0b676d108ef52a6bc8c61adaa5294a9fd8e
2019-02-12DO NOT MERGE - Skip pi-platform-release (PPRL.190205.001) into stage-aosp-masterXin Li
Bug: 124234733 Change-Id: I3a423f5b154bd8ea6f044100d0220eadb4fdfb8b
2019-02-09Snap for 5180536 from 3c5945388619dce7677fb16d52751cf1b7c0db80 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: I233d7e846d82d5ce8dd863e125dbeeddf4d01383
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: e6f7e4caa4 -s ours am: 900ca7f701 -s ours Change-Id: Ib5a44085dcc129bac588ecb8e3b537109ff9b704
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: e6f7e4caa4 -s ours Change-Id: If8a96a21b283988cd341e2de688c60fbe46a6005
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: I3dfecd72d1aa79f1a3547de672f128f259ae8593
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 680ad166fd -s ours Change-Id: Iaae01b0ef3420c97198c241368753bbdf5c0215e
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: I8704ced54b75f6afdff89a39f5a0a32042cb52cc
2018-10-02Snap for 5044688 from 50cd548ad5748c8039de5f48dca9e9b3a9fcd0ca to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot
pi-qpr2-release Change-Id: Ie3809111a7b005dd671544568631761d7eac4724
2018-09-10resolve merge conflicts of 50cd548ad5748c8039de5f48dca9e9b3a9fcd0ca to ↵Chris Forbes
pi-dev-plus-aosp Bug: None Change-Id: I5fb7b243d7d8b858ac946829c72eedc19ce0950d
2018-09-10[RESTRICT AUTOMERGE] Update prebuilts for b/114766361android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devChris Forbes
Update was missed when merging these changes from AOSP. Bug: b/114766361 Change-Id: I827abe18e0d5a5191d098bc0e6ae2141a9b17208
2018-08-20Update prebuilts for KHR_draw_indirect_count am: c0b000da7fChris Forbes
am: 4375c3040f Change-Id: I03d26a2fa15fa3a8994117ada4cac14f17f8df28
2018-08-20Update prebuilts for KHR_draw_indirect_countChris Forbes
am: c0b000da7f Change-Id: Ie18537d0a26ace1f3c47c145214219a2c0673196
2018-08-20Update prebuilts for KHR_draw_indirect_countandroid-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-releaseChris Forbes
Change-Id: I3edc38a45e91fbc72e6ecb9f58ce5346373b9ea4
2018-08-07Merge Android Pie into master am: 9be6958ed5 am: e88be2318aXin Li
am: 0095b737ed Change-Id: Ica7f91412b3ecfc0760d3f0ff7ceb117b42c902d
2018-08-07Merge Android Pie into master am: 9be6958ed5Xin Li
am: e88be2318a Change-Id: If725a1e23c28f9e4034403ac4beb9a98ae705353
2018-08-07Merge Android Pie into masterXin Li
am: 9be6958ed5 Change-Id: I59e844a5e9f0e14dc64e08b718d2dba6bb65b988
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: I90f817eb066217388fe6d3ac3b23a88b27594eec
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: ea5662fef7 Change-Id: I8c7584b6f2ed99bfc08e33891b5241f5e6c8b613
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I0bdceab19070bd13a7e10bdac0ea8e46fd88d758
2018-05-31Snap for 4813226 from 8298e0c19efeea93be8238cfff0b6aadab89412b 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-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_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-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releaseandroid-build-team Robot
Change-Id: I7ad2ae71c98d00538f1aa7abdaa0e03a182bb222
2018-05-30Update prebuilts for b/78779994Chris Forbes
am: 8298e0c19e Change-Id: Id801a6df6823ec0e26ef47c9dd2ef00c33f47e46
2018-05-30Update prebuilts for b/78779994android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devChris Forbes
Bug: b/78779994 Test: CtsDeqpTestCases Change-Id: Ia09d11c7c26a1227c5e27b354647598620eb12f5
2018-05-20Snap for 4793185 from 0a14bab92cdd487404129cb2f5781307b10f4bed to pi-releaseandroid-build-team Robot
Change-Id: Ie0c8a69a86feb8e8ed50c2e851f62e7440dfd2e7
2018-05-17Update SPIRV prebuilts for b/79920276Chris Forbes
am: 0a14bab92c Change-Id: Ic9d228b2fea7af445c86b3f56b89465df38eef80
2018-05-17Update SPIRV prebuilts for b/79920276Chris Forbes
Bug: b/79920276 Test: CtsDeqpTestCases Change-Id: I23d7fd5a97c7e24b7bda637af0b745472bf00af3
2018-03-18Snap for 4662252 from 0ad5d0ca87b0de1789cea89fd8e1741766f10c13 to pi-releaseandroid-build-team Robot
Change-Id: I38df981966fdddd5ad3430d00d587e60ce664709
2018-03-16Merge "Update prebuilts for Vulkan CTS 1.1.0.3" into pi-devChris Forbes
am: 0ad5d0ca87 Change-Id: Ibe90c4b53fa40e4eae9c41e5ca24520f98020332
2018-03-16Merge "Update prebuilts for Vulkan CTS 1.1.0.3" into pi-devChris Forbes
2018-03-15Update prebuilts for Vulkan CTS 1.1.0.3Chris Forbes
Test: make cts, test on pixel Bug: b/74544379 Change-Id: I270b5e063a722109f604687e98878dd5c4cfdce3
2018-03-14Snap for 4653471 from e608b7833f54407e9ccd590c252d5337a61c275a to pi-releaseandroid-build-team Robot
Change-Id: I7000016a81aba309b70596e1bc513eda1afae536
2018-03-14Fix bad path in example prebuilts commandChris Forbes
am: e608b7833f Change-Id: I42b9244fbdecf50d00c78c03873e703091abab1f
2018-03-13Fix bad path in example prebuilts commandChris Forbes
Bug: b/74622354 Test: doc change only Change-Id: I5ea95bb4baad9847e0a0f7cc704a547965560276
2018-03-11Snap for 4647811 from 17d673d01c3e4775b24b1f89575af3078e2fa2cc to pi-releaseandroid-build-team Robot
Change-Id: I6e8da09f5a57e5c659a201e2053648f3ff12395a
2018-03-09Update prebuilts for b/74431715Chris Forbes
am: 17d673d01c Change-Id: I04f84300cf57be04e3930a6ae8f5fb3c7a866222
2018-03-09Update prebuilts for vulkan-cts-1.1.0-feb-mergeChris Forbes
am: 550bca99a9 Change-Id: I88815119ce482efeab6ad7ec8ed5ac8566a744a6
2018-03-09Update prebuilts for b/74431715Chris Forbes
Bug: b/74431715 Test: CtsDeqpTestCases on Pixel/Pixel2 Change-Id: I9918b57f7c11b5463386c0961540f3d0fdc26e53
2018-03-08Update prebuilts for vulkan-cts-1.1.0-feb-mergeChris Forbes
Bug: b/74387723 Test: CtsDeqpTestCases on pixel Change-Id: I3def71a62c51d0c2483ba4de9fb981c8d9ff34fc
2018-03-01Snap for 4628106 from e12214d88b14c8f45ca5e9dfa911075b8a61e9d0 to pi-releaseandroid-build-team Robot
Change-Id: I71a98805ded9cc093d3fbc64e0dc60c9f0ae2abd
2018-03-01Merge "DO NOT MERGE: Update prebuilts to match d9e65c639a9c24" into ↵Chris Forbes
oc-mr1-dev am: e635905370 am: 208d716426 -s ours Change-Id: I32fe0aa8e4ad056dbdbb6eb333675d6b92c2029f
2018-03-01Merge "DO NOT MERGE: Update prebuilts to match d9e65c639a9c24" into oc-mr1-devChris Forbes
am: e635905370 Change-Id: I3441969b290c9d3de679decd1a976178e88b5476
2018-03-01Merge "DO NOT MERGE: Update prebuilts to match d9e65c639a9c24" into oc-mr1-devTreeHugger Robot
2018-02-28DO NOT MERGE: Update prebuilts to match d9e65c639a9c24 am: af1848074d am: ↵Chris Forbes
8c7aa51a7f am: 0201570b44 am: e791a53b2c -s ours Change-Id: I2b1c8208f3144c5fb99e1204bdef226cba560d6e
2018-02-28DO NOT MERGE: Update prebuilts to match d9e65c639a9c24 am: af1848074d am: ↵Chris Forbes
8c7aa51a7f am: 0201570b44 Change-Id: I4330dee8808c520c9aba11fe811e4400a2b6ec17
2018-02-28DO NOT MERGE: Update prebuilts to match d9e65c639a9c24 am: af1848074dChris Forbes
am: 8c7aa51a7f Change-Id: I256e016a80d37862fe7ba57e22eec3004e75a07d
2018-02-28DO NOT MERGE: Update prebuilts to match d9e65c639a9c24Chris Forbes
am: af1848074d Change-Id: I51c337923f57a4e55005fac2caa097c845655093
2018-02-14Snap for 4603395 from e56f73e6f42222f94c74e45a524ed84fc3da031d to pi-releaseandroid-build-team Robot
Change-Id: I24121c04b1eaab3c3ed5766374ef28eeafca0e67
2018-02-13DO NOT MERGE: Update prebuilts to match d9e65c639a9c24Chris Forbes
Bug: b/72972234 Change-Id: I083e810cc2bf306c2f2dc0f14bebd3efb60455d1 (cherry picked from commit 0064d070f968df2b9bea2a670acb9ccff849e2bf)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 20:01:19 +0000