aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-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-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 3bbeaa3d26 am: b0dcd4a2c7 -s ours am skip reason: subject contains skip directive Change-Id: I8d76a8e22b1035c8dbac6eef7d4d9935b909c796
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: 3bbeaa3d26 Change-Id: Id2594c8f41a6fc0d75b290e83c6e9b23d9b4a43f
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: I190b6dcea3636b7e3150597b51dfc6fb7d6400ad
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am: 3ec3e42074 -s ours am: e2c68225d7 -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I066134470e8f5a81206ee7dda9849b68f5884810
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am: 3ec3e42074 -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I1d28b9a7ed52a28309afa14dc5be11dfbca63b55
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: afc87d309e -s ours am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history Change-Id: I89aeb717d28b63ce9da3528bc332cf870d925625
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: I12f3a96cef381aa90bb14fbd7188aa78872735bc Merged-In: Ief1c0eaed98d2a196bca066bfeb83a16e4410887
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
4546008f8a -s ours am: 9826b300bd am: cc12a61f80 am: b26585aa03 -s ours am skip reason: subject contains skip directive Change-Id: Ifbc2f974ee317ae1545aac592e291ca24ec554e9
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
4546008f8a -s ours am: 9826b300bd am: cc12a61f80 Change-Id: I76d0de347c4214930abb083c90d09df37a533f02
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li
4546008f8a -s ours am: 9826b300bd Change-Id: I26b03d764729338bc8debaa18997e97d0a5bd103
2019-09-05[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li
am: 4546008f8a -s ours am skip reason: subject contains skip directive Change-Id: Ibae9702dd7e31c6c2252ca03775ab89e0181e05a
2019-09-05Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21Xin Li
2019-09-04DO NOT MERGE - Merge Android 10 into masterXin Li
Bug: 139893257 Change-Id: Ief1c0eaed98d2a196bca066bfeb83a16e4410887
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 6cecbeb0e6 am: 55ec1ad79d -s ours am skip reason: subject contains skip directive Change-Id: Id8fd2a539d982c3b8b015ac969f38f56858e56df
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 6cecbeb0e6 Change-Id: I64ed07901f67140d56cf289d5099119a1c80f76f
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I130755338d20497a5c12e453a0b6f49a6908236f
2019-05-13Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bb am: 7a2519030aDan Willemsen
am: 72062f2941 Change-Id: I415a105080c5c7ab2b8474e1707d9e91550827ed
2019-05-13Merge changes Ia74dd04d,Ib6a6d3fe am: 6590b8f4bbDan Willemsen
am: 7a2519030a Change-Id: I82e1ff121681acbe225e45967b7e46a8bd0146ef
2019-05-13Merge changes Ia74dd04d,Ib6a6d3feandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Dan Willemsen
am: 6590b8f4bb Change-Id: I7aaa087ebaac6a8ea1f8d6ca778263e6531cc59e
2019-05-13Merge changes Ia74dd04d,Ib6a6d3feTreehugger Robot
* changes: Convert to Android.bp Remove mksdcard from the System source tree
2019-05-11Convert to Android.bpDan Willemsen
See build/soong/README.md for more information. Bug: 122333025 Test: cd sdk; mma Change-Id: Ia74dd04d0cd97aea4374d4e0b8461d3e50d1ac9e
2019-05-10Remove mksdcard from the System source treeJim Kaye
The live version is in aosp/emu-master-dev under sdk/emulator/ Bug: 113514423 Test: None Change-Id: Ib6a6d3fe79d434d3c76a969049c7e212f309b29b Merged-In: Ib6a6d3fe79d434d3c76a969049c7e212f309b29b (cherry picked from commit 131905021f2df34096124c0f93eecc311a60f56d)
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-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-releaseXin Li
am: b6368bc7f9 Change-Id: If2cbff6c6dc53a5e40f20067bdcb4b60febf49aa
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ie2c4de3bfb8fc462367328da788d6f9461ac542b
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I855fc6b040bbed604660fe308082679c123de098
2019-01-24Merge "find_java2: Fix array size calculation" am: 1400d85340 am: c73b2761d7Greg Kaiser
am: 70d3b909d4 Change-Id: Iedd72ea40a2e1edfd3c4792098486a9daef44a1c
2019-01-24Merge "find_java2: Fix array size calculation" am: 1400d85340Greg Kaiser
am: c73b2761d7 Change-Id: If2c68d0743444210ce3b9bff0cc30eca3da5b543
2019-01-24Merge "find_java2: Fix array size calculation"Greg Kaiser
am: 1400d85340 Change-Id: Ifaf8d2dd36565eaf400162604cde10f6d063e2ff
2019-01-24Merge "find_java2: Fix array size calculation"android-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-releaseTreehugger Robot
2019-01-22Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1 am: fd2a17c268Dan Willemsen
am: 438eeed270 Change-Id: I465f5f6290fad04067bf95a13f2f39935bce2cd2
2019-01-22Merge "Remove LOCAL_MODULE_TAGS := debug" am: 98d261c0a1Dan Willemsen
am: fd2a17c268 Change-Id: Ic2cb462914ace75298544f3a6be37ceb211ed490
2019-01-22Merge "Remove LOCAL_MODULE_TAGS := debug"Dan Willemsen
am: 98d261c0a1 Change-Id: I876ce929ed7074dc52641b7798a7d089aa96a318
2019-01-23Merge "Remove LOCAL_MODULE_TAGS := debug"Treehugger Robot
2019-01-19Remove LOCAL_MODULE_TAGS := debugDan Willemsen
This doesn't appear to be necessary here, there are no other references to these in our tree, and hierarchyviewer is deprecated. Users can always trigger these to be installed with `m` Test: treehugger Change-Id: I9fee7813b103598ae0438a6adee625e29f968624
2018-12-28find_java2: Fix array size calculationGreg Kaiser
GetModuleFileName() takes the maximum number of TCHARs we can fit as the final argument, and thus we need to divide by sizeof(TCHAR), instead of multiplying by it. Test: Treehugger Change-Id: Icbbb04c29955075e9341a0153dbd750cce8e884b
2018-11-05Remove DeviceConfigJim Kaye
The version here is obsolete. The live version is in Android Studio (e.g. goog/studio-master-dev) in tools/base/apps/DeviceConfig/ Bug: 117556079 Test: None added Change-Id: I13279ff8b4ec21f20f3b93b127183ce5e2368cbb
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 1fc951b21c -s ours am: de53f696e7 -s ours am: 0c15b39c82 -s ours Change-Id: I453b942f80a58ec42dd4f84e7d7742cdf65192ef
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 1fc951b21c -s ours am: de53f696e7 -s ours Change-Id: Ide10993798e74111a51bc18806abf6b84a2596fc
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 1fc951b21c -s ours Change-Id: Ic7e36caa8b13e4b01f176f430a5344fc936e113e
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: Id89ad1e9f5e9801bd35e555f10f62775f85c1aaf
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: c8bcfc6d97 -s ours am: 35a4ab43da -s ours Change-Id: Ida68a68f91bee6a12a05f5f2f11a8530c39a9be2
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: c8bcfc6d97 -s ours Change-Id: I019187584f69a88d4651049aef65bed2bfd8119e
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: If677da2091a1aa81e9d46dc4f2e16faa7d9163b7
2018-08-30Remove mksdcard from the System source treeJim Kaye
The live version is in aosp/emu-master-dev under sdk/emulator/ Bug: 113514423 Test: None Change-Id: Ib6a6d3fe79d434d3c76a969049c7e212f309b29b
2018-08-28Merge "Remove obsolete windows sdk files" am: 34ce035aa6 am: dee214d4c1Dan Willemsen
am: 20d40f7c52 Change-Id: I9a700dceaad1be598074c33ed32e72c81fe8e6c0
2018-08-28Merge "Remove obsolete windows sdk files" am: 34ce035aa6Dan Willemsen
am: dee214d4c1 Change-Id: I0dd9b4270feb3516dff585d1c71f6232389cecfc
2018-08-28Merge "Remove obsolete windows sdk files"Dan Willemsen
am: 34ce035aa6 Change-Id: I5f1d572b71c131bfe6bca60b20786315c66a8e80
2018-08-28Merge "Remove obsolete windows sdk files"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-27Remove obsolete windows sdk filesDan Willemsen
Test: m win_sdk Change-Id: I8d8f3e4b1f453aba1e350c5c4b5ae5f224328289
2018-08-08Merge "Merge Android Pie into master" am: fec4f7d58d am: ac41ef6b6d am: ↵Xin Li
3692a7d9d2 am: d0586fe50c Change-Id: I6e8896d7abd86881b737ff5b85e0d5357ff0412d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 05:54:58 +0000