aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-31Snap for 5978242 from 1b7e9f45b916fdafad6a450244d6d30735b075db to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r40android-platform-11.0.0_r4android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r3android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r2android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-platform-releaseandroid11-gsiandroid-build-team Robot
Change-Id: I850b8e0081d777da7ae41f3adfcd113e067965ad
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: ea16702014 am: 2b0e573d9f -s ours am skip reason: subject contains skip directive Change-Id: Iedaa35ed0c77d20d42db6717f70e41950ad86e09
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: ea16702014 Change-Id: Icfa5bf522c89a3b49525fcaf1175875509f0eb09
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: I61ab4b35eee6781ec35b6f732255685305ff3c0f
2019-08-22Snap for 5821394 from 76b92c77a94c875d38afb920d31436092f91498a to rvc-releaseandroid-build-team Robot
Change-Id: Id0a5bedd38535e8baa35e0961ca40435c1314754
2019-08-21Merge "Remove no-longer-used README.version." am: 44291488cd am: c3033862a7 ↵Elliott Hughes
am: c9ad037cbc am: ce0bfe339b am: 4e624503b4 Change-Id: I5791b3cd97c80f72f6f5ea2f41a5aa5d539eefca
2019-08-21Merge "Remove no-longer-used README.version." am: 44291488cd am: c3033862a7 ↵Elliott Hughes
am: c9ad037cbc am: ce0bfe339b Change-Id: I951f285bffcdc7cebc505c6ae36e9389c1939c32
2019-08-21Merge "Remove no-longer-used README.version." am: 44291488cd am: c3033862a7Elliott Hughes
am: c9ad037cbc Change-Id: I22f04c956fccb7bb608f9435abe8ece8eb9e063f
2019-08-21Merge "Remove no-longer-used README.version." am: 44291488cdElliott Hughes
am: c3033862a7 Change-Id: I253f9ce4485a65f3d9954cb8663c3e0615742f8d
2019-08-21Merge "Remove no-longer-used README.version."ndk-sysroot-r21Elliott Hughes
am: 44291488cd Change-Id: I0dca633e7fa3e95c0b7f44c9dc5133313e55a242
2019-08-21Merge "Remove no-longer-used README.version."Treehugger Robot
2019-08-21Remove no-longer-used README.version.Elliott Hughes
Test: builds Change-Id: Ie89351c4436a3ae2ff99692190a12d4a3327abf1
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: e451fe7ae7 Change-Id: I49cc07975bba4673aa091cd9fb41b649c42bf03b
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I2f0630089672ee077d2471a72b59dee7cf66d4dc
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: I96accd13bd4b8e56b2a3b0607918b3aec98d563b
2019-01-17Merge "Switch to system/core/janitors as OWNERS." am: 565eedb3e8 am: def3b9a41fChih-hung Hsieh
am: 7577ba6e8a Change-Id: I9662f2868e71f1e8638876554ea5e703bc80fabc
2019-01-17Merge "Switch to system/core/janitors as OWNERS." am: 565eedb3e8Chih-hung Hsieh
am: def3b9a41f Change-Id: I518460560c13de4c73cc00e1d7dfeadec16e459f
2019-01-17Merge "Switch to system/core/janitors as OWNERS."Chih-hung Hsieh
am: 565eedb3e8 Change-Id: I3c9578c1aeccbc8233536dc39f420f10db83264b
2019-01-17Merge "Switch to system/core/janitors as OWNERS."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-releaseChih-hung Hsieh
2019-01-17Switch to system/core/janitors as OWNERS.Elliott Hughes
Change-Id: I2cf2345c61aa3f025a06624e56533333fd52ef07
2019-01-11Merge "Upgrade to tinyxml2 7.0.1 (2018-11-17)" am: 3988a1aa99 am: af4d68c62eElliott Hughes
am: 059a7ba2c0 Change-Id: Ica05e42711756a1f7d0444e871cfad170ad846dc
2019-01-11Merge "Upgrade to tinyxml2 7.0.1 (2018-11-17)" am: 3988a1aa99Elliott Hughes
am: af4d68c62e Change-Id: I52ef48fc62aa1b4c9de0e6863d865352d67a54e7
2019-01-11Merge "Upgrade to tinyxml2 7.0.1 (2018-11-17)"Elliott Hughes
am: 3988a1aa99 Change-Id: I21842d0b8580bb4ab2c769a739dcc665f244824f
2019-01-11Merge "Upgrade to tinyxml2 7.0.1 (2018-11-17)"Elliott Hughes
2019-01-10Upgrade to tinyxml2 7.0.1 (2018-11-17)Elliott Hughes
Test: builds, boots, tinyxml2 tests pass Change-Id: Ia4ca2327925f9a678cbae6febdb5341151a1ec10
2019-01-08Merge "Add default code reviewers into OWNERS" am: 412ad92a26 am: 5676bde7faChih-hung Hsieh
am: 52b31c8e8d Change-Id: I3a3780c768be449fab40a22e683a05d6a96890ab
2019-01-08Merge "Add default code reviewers into OWNERS" am: 412ad92a26Chih-hung Hsieh
am: 5676bde7fa Change-Id: I762b50dcea24db637785fe79b141b617af840190
2019-01-08Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
am: 412ad92a26 Change-Id: Ife6530409867a242f2010ef64f32258acab7ecf7
2019-01-09Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh
2019-01-08Add default code reviewers into OWNERSChih-Hung Hsieh
Bug: 33166666 Test: gerrit uploader Change-Id: I6601a77fc343fbf6a53fc76c6f04ac15d7018cdb
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9a086af735 -s ours am: c77032e319 -s ours am: ee4e3a27a5 -s ours Change-Id: I2732cee58761564e163d5441eab92a2054900d49
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 9a086af735 -s ours am: c77032e319 -s ours Change-Id: Ie48c0cb6aeb588544ec4c2426c4182fedacd9dcd
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 9a086af735 -s ours Change-Id: I087ec41b24347f9a0d2c80c1363aa2142b2ee2b4
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: I24af49b9e678348f42ec5061be42215ae6be6133
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 0eb96664a0 -s ours am: 4286716886 -s ours Change-Id: Id8c0624220fad36c72ceedbc6b540bb34bd60e7f
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 0eb96664a0 -s ours Change-Id: Ib16fcdd794ff89b6f68714ec65539191d8b48ed2
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: If67a2e046fafc1a817611772e449f415d1e77c6e
2018-09-06Merge "Suppress -Wimplicit-fallthrough." am: 0f483fa3df am: 5d0ec9133fChih-hung Hsieh
am: 17bba6ce44 Change-Id: Ia4d850f0550472e9493120be349b200b5950b324
2018-09-06Merge "Suppress -Wimplicit-fallthrough." am: 0f483fa3dfChih-hung Hsieh
am: 5d0ec9133f Change-Id: Ic22d2f8552482fda962b2ea5da1281e6d5253060
2018-09-06Merge "Suppress -Wimplicit-fallthrough."Chih-hung Hsieh
am: 0f483fa3df Change-Id: I923c6b38bb0a2b4e6378e4e4f25a1aa706ffe6df
2018-09-06Merge "Suppress -Wimplicit-fallthrough."android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseChih-hung Hsieh
2018-09-04Suppress -Wimplicit-fallthrough.Chih-Hung Hsieh
-Wimplicit-fallthrough will be enabled globally. Test: build with global -Wimplicit-fallthrough. Change-Id: I02e0bda3386cd2e48e4178083f2194a662b66d0f
2018-07-17Merge "Add recovery_available." am: c523f34fde am: dd7a9809cfYifan Hong
am: 08e28047e1 Change-Id: I81c78f7ff08a17422a68a60a66863f48494306d5
2018-07-17Merge "Add recovery_available." am: c523f34fdeYifan Hong
am: dd7a9809cf Change-Id: I6661fd20d7adb0b4ba24b5e0be24dffd29a4f6ae
2018-07-17Merge "Add recovery_available."android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3Yifan Hong
am: c523f34fde Change-Id: Id7be1c8ac80740e210924ad928a219ae9bbb3e72
2018-07-17Merge "Add recovery_available."android-n-iot-release-smart-display-r2Yifan Hong
2018-07-16Add recovery_available.Yifan Hong
Test: pass Bug: 80132328 Change-Id: I11018845161f115115e90e2ee9f55c46fc7c737e
2018-04-26Merge "Remove workaround for a fixed bug." am: c4a167426f am: af97853138android-build-prod (mdb)
am: 27ba7e054e Change-Id: I0a62b86ba2305cc42253f92ac3ca1dac038f551c
2018-04-26Merge "Remove workaround for a fixed bug." am: c4a167426fandroid-build-prod (mdb)
am: af97853138 Change-Id: Ie2b0e61877bf782fe56ab05099389577ecb711ab
2018-04-26Merge "Remove workaround for a fixed bug."android-build-prod (mdb)
am: c4a167426f Change-Id: I16e8a305b6c1c6dbb898da8b3863b28462db9fcb