aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-06Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2aosp-emu-30-releaseXin Li
2020-06-03Merge QQ3A.200605.002 into masterXin Li
Bug: 158095402 Merged-In: I56de1383532958604d92add58f86dfc001407477 Change-Id: I36c3c76ef620780cba68639827aae4d6eea62f7d
2020-05-01Snap for 6450316 from bff3031448389babcee2693c746a6534355c95ff to sc-d1-releaseandroid-build-team Robot
Change-Id: I529708d17b1ad25d901f3cbf16dd6729b818337b
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE" am: d4c7aec7a2 am: 17cf9d21c6 am: ↵Treehugger Robot
536140f89c am: c588512b59 am: 3da0ccf5fe am: 9443f9e84c Change-Id: Ib91d405265a024f21327bac25ca1f1623269e466
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE" am: d4c7aec7a2 am: 17cf9d21c6 am: ↵Treehugger Robot
536140f89c am: c588512b59 am: 3da0ccf5fe Change-Id: If3589a830389910be12f3f1e77d856a51f2813eb
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE" am: d4c7aec7a2 am: 17cf9d21c6 am: ↵Treehugger Robot
536140f89c am: c588512b59 Change-Id: Ia0b4970e0bc9737bbafd3d95cf83a03d4b46b4f4
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE" am: d4c7aec7a2 am: 17cf9d21c6 am: ↵Treehugger Robot
536140f89c Change-Id: I901fb75d58d2b6cd0bbb5259286db3c967fe4f12
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE" am: d4c7aec7a2 am: 17cf9d21c6Treehugger Robot
Change-Id: I1ce5d93f17b2544c6bfc1621941e7fff1532303a
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE" am: d4c7aec7a2temp_QQ3A.200605.002Treehugger Robot
Change-Id: I56de1383532958604d92add58f86dfc001407477
2020-04-30Merge "Add METADATA to libyuv: BSD=NOTICE"Treehugger Robot
2020-04-29Add METADATA to libyuv: BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I192eecfcec9032209db0c2dd89d91edb6197e6e7
2020-04-28Snap for 6435952 from 968ddac4ff6e38bbbce2ff38c75ee5cf762ed93e to sc-d1-releaseandroid-build-team Robot
Change-Id: I631207141288529b31a245b430cf7af3510c973d
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 am: 38bdba20e2 am: 594ff4f752 -s ours am: f5b45df76d -s ours am: 0f29b03b91 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: I67ccdbc17271d94c478817cb65922b811c2b25c1
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 -s ours am: 1936f9688e -s ours am: 702e1d4fff -s ours am: 1fb105242f -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: I4b031f1b17be77767b81e88111f11aa0756f4141
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am: bb6cdd2c0c -s ours am: a10791aebb -s ours am: f4f6858ad5 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I59bfeaea3ae9efdf851801e6ceacb613bc9d09cc
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 am: 38bdba20e2 am: 594ff4f752 -s ours am: f5b45df76d -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: Iaeb7ef0d76eca424891de56f2566ae604170910f
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 am: 38bdba20e2 am: 594ff4f752 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: Ic844d960b635e25c546136af34d4a47cb91849f5
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 -s ours am: 1936f9688e -s ours am: 702e1d4fff -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: I91bfc7a96eb549a36546b2d3f9e59e6424767992
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am: bb6cdd2c0c -s ours am: a10791aebb -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I95ced294cc5a1f30b8f7f951498e7208b1823f5a
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 -s ours am: 1936f9688e -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: Ie918e198f14b36cc7d8a840f2642f9eb81338007
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am: bb6cdd2c0c -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I5ee3d73ffa9c7ccb3136161427456432588d564d
2020-04-27Set min_sdk_version to be part of mainline modules am: edabab205c am: ↵Jooyung Han
3087a6b713 am: 38bdba20e2 Change-Id: I0b9b441e48123a3fd9db742cd2ac0eb3d7993f78
2020-04-27Set min_sdk_version to be part of mainline modules am: edabab205c am: 3087a6b713android-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_r18android11-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-d2-releaseJooyung Han
Change-Id: Ib0870e40af937a020a4b2dbefbc5b73c3810f483
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c am: 3087a6b713 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 edabab205c is in history Change-Id: I471be76fe3cf6dc44442817702bd76f76d4bfa90
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am: 4aff610208 -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: I86d2f1580520b549ec8df8a14d9b4fd6bd9b0139
2020-04-27[automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han
edabab205c -s ours am skip reason: Change-Id Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e with SHA-1 153d61e685 is in history Change-Id: Ibddaf37cd4780eb79fffd9bcd405dc25a1f22044
2020-04-27Set min_sdk_version to be part of mainline modules am: edabab205candroid-11.0.0_r16android11-d1-b-releaseJooyung Han
Change-Id: I73d0efb1202ce62f7aa287f141befdd8bcba21f7
2020-04-27Set min_sdk_version to be part of mainline modulesandroid-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-devJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e Change-Id: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e (cherry picked from commit 153d61e685d083f35d2aff53cb03ed12aa977ac4)
2020-04-24Snap for 6425114 from a6b48b53fb6c59277f8ee4c3e2aa572af22043c9 to sc-d1-releaseandroid-build-team Robot
Change-Id: I1febd2d4ce5bf84803e8a7cde76a03d24622523a
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 am: 8c6fde8b57 am: d1c410900c am: 6784b555e2 Change-Id: I68692a505c110656519ac8585844099fa7498c40
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 am: 8c6fde8b57 am: d1c410900c Change-Id: I0d73497f28fc26c79b295715deb54483db2ae2c5
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 am: 8c6fde8b57 Change-Id: Ic6ffa3ab11412aa7194af0c41f806d7b162db471
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 am: b999e5d774 Change-Id: I0c9892b03c04a69dbd75488b1932541814e64efb
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4d ↵Jooyung Han
am: 9354324ef0 Change-Id: I7da3f3771726ac0b460b193b1606cca3a7e0ecc4
2020-04-23Merge "Set min_sdk_version to be part of mainline modules" am: 1cad419d4dJooyung Han
Change-Id: Id4fad73cf4ea66203711c19696289a06c5793012
2020-04-23Merge "Set min_sdk_version to be part of mainline modules"Jooyung Han
2020-04-23Set min_sdk_version to be part of mainline modulesJooyung Han
Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: Ieda1b7f0de1c4a5ce4137a0b17731cf619826f9e
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff am: d71f6e1f52 am: 370260bc0c -s ours am: 28b47bab58 Change-Id: Ib23e50657dacc121a6b3af62814412d073fc3df3
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff am: d71f6e1f52 am: 370260bc0c -s ours am skip reason: subject contains skip directive Change-Id: I41868083f3d09b96f2244629dd8d896509ad38a2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff am: d71f6e1f52 Change-Id: I55fe78a059ebc8c3a45f11ba5addd9e3d3478396
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am: 5fe9da01ff Change-Id: I950acc613a06a3cef2f24c0e695110a319cac7f0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3e4aaec338 -s ours am skip reason: subject contains skip directive Change-Id: I643b432924cd21e4a653ca844a1a329e7d6df50e
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I6786c6a810c504f1ac50bb566ff96840c6591c18
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd am: e09047ec79 am: 4d5a8760e3 -s ours am skip reason: subject contains skip directive Change-Id: Ie3f16b4d31d61b5b3a3dbd99feb67ce9ea1677aa
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd am: e09047ec79 Change-Id: I5d31e8fa645341e14f036f6fffa836e864826f65
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am: df4dc934fd Change-Id: Iacc56c0b90ef743e8dece2f007593c7a9016303b
2020-03-20DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master ↵Xin Li
am: c2c2a13316 Change-Id: I9dfc699d221c900c3a80dfc9d691e74cb9f834ea
2020-03-20[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stage-aosp-master am: c2c2a13316 -s ours am skip reason: subject contains skip directive Change-Id: I38f99bf99b4236a53a078a03b51d867bd188495b
2020-03-19DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-masterXin Li
Bug: 151763422 Change-Id: I8eadedc148f7f5a5a59c1ba831712ca49f2e5719
2020-02-14[automerger skipped] Cherry-pick security fix for skip_input_data am: ↵Chong Zhang
956052dd8b am: d5973796ce -s ours am skip reason: skipped by user chz Change-Id: Ib192f88aa7ea7c2d2fc03a7f8ffeb9027507b260
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 07:44:40 +0000