summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-05-15[automerger skipped] Add METADATA to qemu: Apache2=NOTICE am: e643a7fec2 -s ↵Bob Badour
ours am: 2704c4ebc8 -s ours am skip reason: Change-Id If3463471033aa6667af8ab4ee25cb885f26a3d0b with SHA-1 74654e4aa3 is in history Change-Id: I1ea9ce13735e2f8adf6113bae2c7ae5f94bbe142
2020-05-15Add METADATA to qemu: Apache2=NOTICE am: e643a7fec2 am: 52f62715b6Bob Badour
Change-Id: Ibe822a2ee57c3e3b5191ebb0911ba2811fdeeb26
2020-05-15[automerger skipped] Add METADATA to qemu: Apache2=NOTICE am: e643a7fec2 am: ↵Bob Badour
52f62715b6 -s ours am skip reason: Change-Id If3463471033aa6667af8ab4ee25cb885f26a3d0b with SHA-1 74654e4aa3 is in history Change-Id: Iedd823de18c2c21bc4860f6ae34d77914bd5a1bc
2020-05-15[automerger skipped] adbd is not available for platform am: f29a03d87d -s oursJiyong Park
am skip reason: Change-Id I27e3a612b780f313be78830666ee1d57c490c2ee with SHA-1 51625bf5b7 is in history Change-Id: Ifad6ab0e535bfd251576a560fc84aaedf0310306
2020-05-15adbd is not available for platform am: f29a03d87dJiyong Park
Change-Id: If5f4f94218a7adb9e9d7859da689db84633a5d79
2020-05-15adbd is not available for platform am: f29a03d87dJiyong Park
Change-Id: I47652907f2cfb8c32f259ac10a596a42e0533fac
2020-05-15[automerger skipped] Add METADATA to qemu: Apache2=NOTICE am: e643a7fec2 -s oursBob Badour
am skip reason: Change-Id If3463471033aa6667af8ab4ee25cb885f26a3d0b with SHA-1 74654e4aa3 is in history Change-Id: I2d66ccd89f68ea608b145c9d7b8d00aa413718f0
2020-05-15Add METADATA to qemu: Apache2=NOTICE am: e643a7fec2Bob Badour
Change-Id: Ib839adac979e02f3fa41c1da18a584684478965d
2020-05-15Add METADATA to qemu: Apache2=NOTICE am: e643a7fec2Bob Badour
Change-Id: Ifb58f194a199aad8cf60fba250aa2ce1853eafd2
2020-05-15Retire device/generic/qemuandroid11-devRoman Kiryanov
Bug: 154151802 Test: presubmit Signed-off-by: Roman Kiryanov <rkir@google.com> Change-Id: Iab852783c2728f5757a4a1e051119fd50f389df6
2020-05-15adbd is not available for platformJiyong Park
adbd is in the adbd apex (com.android.adbd) and is not available for platform. To refer to the adbd in the apex in *.mk file, we need to use its apex-specific name <module_name>.<apex_name>. Bug: 152190149 Test: choosecombo into qemu_arm and m Merged-In: I27e3a612b780f313be78830666ee1d57c490c2ee Change-Id: Ia31489ef04de4b2d44ea961bed8a78326fb68ef0
2020-05-15Add METADATA to qemu: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Merged-In: If3463471033aa6667af8ab4ee25cb885f26a3d0b Change-Id: I03d0e5e4cb211aa664ae4ad3fcfb18eaab362de0
2020-05-05Add METADATA to qemu: Apache2=NOTICE am: 74654e4aa3 am: c690ef301f am: ↵Bob Badour
9c0860a7ea am: 51aed68305 am: 62015dfc41 Change-Id: I07dc7e79a975175f21ae77961925599f8e16e172
2020-05-05Add METADATA to qemu: Apache2=NOTICE am: 74654e4aa3 am: c690ef301f am: ↵Bob Badour
9c0860a7ea am: 51aed68305 Change-Id: I1d6a92f4b12379c1856d9ee769481c0276cac47f
2020-05-05Add METADATA to qemu: Apache2=NOTICE am: 74654e4aa3 am: c690ef301f am: ↵Bob Badour
9c0860a7ea Change-Id: If473f196d10600aa9055d3b8d7e716f385c8105a
2020-05-05Add METADATA to qemu: Apache2=NOTICE am: 74654e4aa3 am: c690ef301fBob Badour
Change-Id: I5f09a3961272739842090459417d06ada6656610
2020-05-05Add METADATA to qemu: Apache2=NOTICE am: 74654e4aa3Bob Badour
Change-Id: I7a4895cc3a57b235e2066a2cdf894a7fb367c791
2020-05-01Add METADATA to qemu: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: If3463471033aa6667af8ab4ee25cb885f26a3d0b
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 63ad6c34b6 -s ours am: 694cc94df0 am: 9c02ed051d am: 470efa128c -s ours am skip reason: subject contains skip directive Change-Id: Id91dc08229ea54344b6717de241b541471f483dc
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 63ad6c34b6 -s ours am: 694cc94df0 am: 9c02ed051d Change-Id: Ibf3e809b511c1861d76dbbe780fc911dc49566a4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 63ad6c34b6 -s ours am: 694cc94df0 Change-Id: I0d74fbefd4fc524ec4430e57480311f12cc614d1
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 63ad6c34b6 -s ours am skip reason: subject contains skip directive Change-Id: I94669cfcb03c9acd951ea7885d768d53e52d5307
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I1a07999adab7b113b725e8684d15c21ef433cdc0
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a am: dda4347759 am: 6750dcd263 am: 6a0a829eba -s ours am: 4f1091cb95 -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 2a6f1ed29a is in history Change-Id: I1203906e62fc0caebe60cd52d08bb5d719a863bb
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a -s ours am: 1a94c1a998 -s ours am: 8a985ba23d -s ours am: 2de86a8a3c -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 2a6f1ed29a is in history Change-Id: I56ccd4498e56d73c55f3f39fa2065344a96daa2b
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a am: dda4347759 am: 6750dcd263 am: 6a0a829eba -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 2a6f1ed29a is in history Change-Id: I764d1b86eaa9778625eca9d0f26237f347d3fc1d
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a am: dda4347759 -s ours am: e80723398e -s ours am: 40dfa7b851 -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 af3ae258ba is in history Change-Id: I47c8fa12176dcf8f26fc8938690118a21f60e2df
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a -s ours am: 1a94c1a998 -s ours am: 8a985ba23d -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 2a6f1ed29a is in history Change-Id: I2231cb017d912c85ef555f62c6d712af0db468d2
2020-04-09Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: 2a6f1ed29a am: dda4347759 ↵Ulya Trafimovich
am: 6750dcd263 Change-Id: I812b25602a8c422b0350914395563028385de041
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a am: dda4347759 -s ours am: e80723398e -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 af3ae258ba is in history Change-Id: I22e4ff93a9d30d182ec1c4904b49bbe5abc89231
2020-04-09Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: 2a6f1ed29a am: dda4347759Ulya Trafimovich
Change-Id: Ieb3bb4af088ffa23e0e85670145be76c4827da40
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a -s ours am: 1a94c1a998 -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 af3ae258ba is in history Change-Id: I1bcfac9572581656172dfc849e2286278a11015d
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a am: dda4347759 -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 af3ae258ba is in history Change-Id: I613cbacf9392017d005d4f06e987a3e848f2de66
2020-04-09Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: 2a6f1ed29aUlya Trafimovich
Change-Id: Ibf39e288f92d936dcd5dd469bc808c06a7e68409
2020-04-09[automerger skipped] Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS. am: ↵Ulya Trafimovich
2a6f1ed29a -s ours am skip reason: Change-Id I9c03715b0658529b4df66a5d7f1aefc28d210476 with SHA-1 af3ae258ba is in history Change-Id: Idbdee5a82edaa841008c819c84facd4f2d5ae300
2020-04-09Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS.Ulya Trafimovich
This was should have been done in https://r.android.com/1265301 (but was accidentally forgotten). Test: lunch qemu_arm && m nothing Bug: 147579140 Change-Id: I9c03715b0658529b4df66a5d7f1aefc28d210476 Merged-In: I9c03715b0658529b4df66a5d7f1aefc28d210476 (cherry picked from commit af3ae258baa5179ec9f2f9f6bfa7122091c12214)
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: ↵Ulyana Trafimovich
9263423526 am: 63c275674d am: 97d3df59ae am: c6899206d9 Change-Id: I38fe041d81635c9fa917270e6bc92afb90443eb2
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: ↵Ulyana Trafimovich
9263423526 am: 63c275674d am: 97d3df59ae Change-Id: Ic97abc44c391078e318b02c82a0398fb066b9b06
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: ↵Ulyana Trafimovich
9263423526 am: 63c275674d Change-Id: I58f53710c523b1f8630df89e7006ff8def8776f8
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: ↵Ulyana Trafimovich
9263423526 Change-Id: I2f5a539bec2e10f86ab043ec869b7452ad293890
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3 am: ↵Ulyana Trafimovich
9263423526 Change-Id: If134409b812f1c14a406018dffc3763d6f6a9748
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS." am: ae87e924d3Ulyana Trafimovich
Change-Id: Ia67417e2dbca07cf42370a7889e16038de5dc94c
2020-04-08Merge "Add conscrypt to PRODUCT_UPDATABLE_BOOT_JARS."Ulyana Trafimovich
2020-03-26Merge "adbd is not available for platform" am: 86fe69b5fd am: 4a895ff484 am: ↵Treehugger Robot
ca2c961523 am: bfaf891c2f am: 347378ab53 Change-Id: I52f7e796c7d10b707546d6f0bdb6506bfe723cee
2020-03-26Merge "adbd is not available for platform" am: 86fe69b5fd am: 4a895ff484 am: ↵Treehugger Robot
ca2c961523 am: bfaf891c2f Change-Id: I003677e9d18038c327d41d39979492084af1d2a6
2020-03-26Merge "adbd is not available for platform" am: 86fe69b5fd am: 4a895ff484 am: ↵Treehugger Robot
ca2c961523 Change-Id: I15c85416230cc004de37dd7e78fbec6670f638d4
2020-03-26Merge "adbd is not available for platform" am: 86fe69b5fd am: 4a895ff484Treehugger Robot
Change-Id: Ied5340f6a4d2518978d9f07e2ddc30e8db5faf03
2020-03-26Merge "adbd is not available for platform" am: 86fe69b5fd am: 4a895ff484Treehugger Robot
Change-Id: Ie931d15b520afe98ed64e85a7a2a3be46f4a6055
2020-03-26Merge "adbd is not available for platform" am: 86fe69b5fdTreehugger Robot
Change-Id: I602c1748ca9b02864e0f5b165f3cc168b20a4e24
2020-03-26Merge "adbd is not available for platform"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 20:53:33 +0000