aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r11android-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_r12ndk-sysroot-r21android10-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-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 16e42bb744 -s ours am skip reason: subject contains skip directive Change-Id: I38d4ced5bc1fa3b820c5743fd046da95d3d5c9b5
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li
Bug: 120848293 Change-Id: I72514644355536069307552c197120c53af4f53f
2019-01-08Add default code reviewers into OWNERS am: 84f437d9b4 am: d2e42ffc06Chih-Hung Hsieh
am: 4dd50d765d Change-Id: Iec484ed5b66cebcca0d1203a5746ee3ff0ff27b2
2019-01-08Add default code reviewers into OWNERS am: 84f437d9b4Chih-Hung Hsieh
am: d2e42ffc06 Change-Id: Iee817810bc8ef1731b4bef09eb6f4a001854423d
2019-01-08Add default code reviewers into OWNERSChih-Hung Hsieh
am: 84f437d9b4 Change-Id: If50408d54efff320ba2adadc76dd0c0b12fa2ea6
2019-01-08Add default code reviewers into OWNERSandroid-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-releaseChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: Ia443e50e3e9e8bd05268943ab26a5e852f8b7ee6
2018-12-10[automerger skipped] DO NOT MERGE am: 089435131f -s ours am: 04a9230af0 -s ↵Xin Li
ours am: aff7764a6a -s ours Change-Id: Icb1a52aa3d94d9fe7b06821580aa678b465167e8
2018-12-10[automerger skipped] DO NOT MERGE am: 089435131f -s oursXin Li
am: 04a9230af0 -s ours Change-Id: I3ffd4d806dec004f3535f8dba1fd73a29646e532
2018-12-10[automerger skipped] DO NOT MERGEXin Li
am: 089435131f -s ours Change-Id: Ic34ac59f1cd3f91c7cc1a2717b27f7b3f07610b6
2018-12-07DO NOT MERGEandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Xin Li
Merge pie-platform-release (PPRL.181205.001, history only) into master Bug: 120502534 Change-Id: Ib209878ff3797875a37c4a3a354df518c52436b2
2018-11-20Convert sync_clock_jni to Android.bp am: d4e5f84fbe am: 74949f7174Dan Willemsen
am: 60690b820b Change-Id: If09c2643a892c42214c58581d21345df93411572
2018-11-20Convert sync_clock_jni to Android.bp am: d4e5f84fbeDan Willemsen
am: 74949f7174 Change-Id: If5c06b3f58aeca5c2755b8e999917ae8b4e155dd
2018-11-20Convert sync_clock_jni to Android.bpDan Willemsen
am: d4e5f84fbe Change-Id: Ib6ae5f44bc2eb7790cd4dcf3b9da56426bcf34e9
2018-11-19Convert sync_clock_jni to Android.bpandroid-wear-8.0.0_r2Dan Willemsen
See build/soong/README.md for more information. Test: cd external/walt; mma Change-Id: I1c98d046b51f7bdc8909571bd684a0754fa87820
2018-08-08Merge Android Pie into master am: a096c61e90 am: 9cea0afe51 am: 56b988de96Xin Li
am: b57591053a Change-Id: Ic5ff857483b290d15d88886905358cd165e2bc89
2018-08-07Merge Android Pie into master am: a096c61e90 am: 9cea0afe51Xin Li
am: 56b988de96 Change-Id: I3af0ca08cf798279d1425f828858ce10138dd156
2018-08-07Merge Android Pie into master am: a096c61e90android-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-fcsXin Li
am: 9cea0afe51 Change-Id: I7419458e7722020b03a3a66d69a157b660cdfa5a
2018-08-07Merge Android Pie into masterXin Li
am: a096c61e90 Change-Id: Ie698ecbb3a3e8a5bc9f131f4ec5c84864affbdd9
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseXin Li
Bug: 112104996 Change-Id: Ic00524e8aebe77b55a213ac0783911b7902c88f9
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 850a5e5ac2Xin Li
am: 3c6b3595a9 Change-Id: I94bec0ebe9dca64bdcdedb3cc1cb31ead726d5a9
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 850a5e5ac2 Change-Id: Id508a2dd91c5e320c37485df71ba6342d7e99610
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-mastertemp_p_mergeXin Li
Bug: 79597307 Change-Id: I2c96d345f79706b8158e4aaea29ca77749efd62f
2017-11-16Snap for 4455093 from 0fe49d4a5efe7c5bb6a932cc210371aa3a27596d 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-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot
Change-Id: Icd87bc63ce8ca6f737a94c8a8235475f6fa7e6ca
2017-11-15Add NOTICE and MODULE_LICENSE_APACHE2android-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_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-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_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devAndrew Lehmer
Bug: 69316634 Test: N/A Change-Id: Id6cebc72a370a4f0aca4ad56ef3984c2d394f18b
2017-10-25Snap for 4415813 from a15eed89fef8ef771026d8cdfc21d2992b01dd36 to pi-releaseandroid-build-team Robot
Change-Id: I02b0674debcc8ddb2376a94a803bc486a0a736d2
2017-10-24Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ↵Bill Yi
a67c00187b am: 37c75fea56 am: 8196e0266f Change-Id: I3e07749aab3b0731b9bf66418a1fc03d7c5b723f
2017-10-24Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: a67c00187bBill Yi
am: 37c75fea56 Change-Id: Ica7853f0ede789c6a83836b880b4b0388fdc55fb
2017-10-24Merge remote-tracking branch 'goog/stage-aosp-master' into HEADandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Bill Yi
am: a67c00187b Change-Id: Ibc05f80edc9f564b5e4cfe8163814e07cef23e50
2017-10-24Merge remote-tracking branch 'goog/stage-aosp-master' into HEADBill Yi
2017-10-23Initial empty repositoryBill Yi
2017-05-09walt: modify for use with Salad Fingersoreo-mr1-devoreo-dr1-devAndrew Lehmer
Bug: 37779957 Test: end-to-end tests with uncommited PTS changes for salad_fingers Change-Id: I4d0a59b04fb92d45899400ca36eb93fb8249c086
2017-04-27walt: fix internal build system errorsAndrew Lehmer
Although external/walt is not part of a full build, the JNI it defines includes an Android.mk which is somehow picked up in test builds. The original code contains several unused parameter warnings that get converted to errors during test builds, and this change cleans those up. Bug: 37744894 Test: `mma -j48` in android/WALT/app/src/main/jni/ builds cleanly Change-Id: I354df5d168bc4550df19258035fdb33ac7249831
2017-04-26Import google/waltAndrew Lehmer
Cloned from https://github.com/google/walt.git without modification. Bug: 36896528 Test: N/A
2017-04-26Initial empty repositorykuantung