aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add METADATA to system_api: BSD=NOTICE am: 6f8051d341 am: 1f322ad4c1HEADmasterBob Badour2020-04-291-0/+3
|\ | | | | | | Change-Id: I903a24cb2a019ea93d0cc43dafce1abc78e1a75b
| * Add METADATA to system_api: BSD=NOTICE am: 6f8051d341android-r-beta-3android-r-beta-2Bob Badour2020-04-291-0/+3
| |\ | | | | | | | | | Change-Id: Ife8cc820ee2f6cc6a5010a2d14d47358d348ca24
| | * Add METADATA to system_api: BSD=NOTICEBob Badour2020-04-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I5f9876d6dd6a9c08d3361d6ab753f92be39adee2
* | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 02d6e74ded -s ours am skip reason: subject contains skip directive Change-Id: I056cbadbf703438c1468ecd947995aebdebf1d21
| * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I1a9df8851be2d6efc360266b6599f3bd671d026b
| | * \ Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2Bob Badour2020-03-301-27/+0
| | |\ \ | | |/ / | |/| | | | | | Change-Id: Id1d913e1a7979ca9278e74c1e542b3246a34d35f
| | * | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li2020-03-190-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 5f25b45491 Change-Id: I93d726649cfcfe44ce0a0266ba9c0ce59c3b5716
* | | | | Remove redundant NOTICE copied from LICENSE. am: d827f1513b am: 8e2fa477b2Bob Badour2020-03-301-27/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: I3346513f9e979dca18a8c73ea90cfbf5a57153a6
| * | | | Remove redundant NOTICE copied from LICENSE. am: d827f1513bBob Badour2020-03-301-27/+0
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| Change-Id: If0e4bb35f9d0fe8f0f982f5793c83517e7dae951
| | * | Remove redundant NOTICE copied from LICENSE.Bob Badour2020-03-251-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ic85f87c7bf3aa29d38d56ac600bb70d8dc4a8e48
* | | | [automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li2020-03-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5f25b45491 -s ours am skip reason: subject contains skip directive Change-Id: I97af6d2a46f1dd2d2c5b01a1c6916636a996dbbf
| * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | Bug: 151763422 Change-Id: I1e79ed691a36790ffe44081e082552e28599940b
| | * | Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9cAutomerger Merge Worker2020-03-051-0/+2
| | |\ \ | | |/ / | |/| | | | | | Change-Id: I32dc10aadf92f3061860b718f9afb63cfe9f0dc4
* | | | [automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e ↵Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -s ours am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history Change-Id: Ic843966341d0167591455ad01549cbda9abbef65
| * | | | Add kUpdateStatusCleanupPreviousUpdate.android11-devYifan Hong2020-03-051-0/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Test: pass Bug: 147696014 Change-Id: I63160745c5904597d4faf573a556ada753674b9f Merged-In: I63160745c5904597d4faf573a556ada753674b9f
* | | | Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bc am: 8e3c34ad9cAutomerger Merge Worker2020-03-051-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / Change-Id: Idd284bc9c7fed822bc4f96cf42e22242a5dd532a
| * / Add kUpdateStatusCleanupPreviousUpdate. am: 2e466f96bcAutomerger Merge Worker2020-03-051-0/+2
|/| | | |/ | | | | Change-Id: Iba6d1adaa9c1a182ecddac823bec14f32b2c8c11
| * Add kUpdateStatusCleanupPreviousUpdate.android-r-preview-4android-r-preview-3android-r-preview-2Yifan Hong2020-02-261-0/+2
|/ | | | | | Test: pass Bug: 147696014 Change-Id: I63160745c5904597d4faf573a556ada753674b9f
* [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-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-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-240-0/+0
|\ | | | | | | | | | | | | am: 652ca8938a -s ours am skip reason: subject contains skip directive Change-Id: I14d01d3ce51da142180a96718af07ad870037d06
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\ | | | | | | | | | | | | Bug: 120848293 Change-Id: Ie360a56b58e71335ef1acc28af11f7fae081e7a7
* | \ [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours am: 70392a8547 -s ours Change-Id: I687d8f26a39961de73400089140aaa9a2acdfdd8
| * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | MERGE am: 9eaf8f485b -s ours am: 59d8301e4d -s ours Change-Id: I8bd0ea3bbd06359438e64e89ffcbc0615032d962
| | * [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 9eaf8f485b -s ours Change-Id: I4e39afb1df962b680893fee8b1d47fc0fe3ef588
| | | * Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-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-r4android-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-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-n-iot-release-ihome-igv1oreo-mr1-iot-releasenougat-iot-releaseBill Yi2018-10-240-0/+0
| | | |\ | | | | | | | | | | | | | | | Change-Id: Ibb6a0c3e4b887ebce0f6bbfea956fa63f23fc2b1
* | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: bc9b060c28 -s ours am: 56ddfbd7c6 -s ours Change-Id: I33f0161bc965e613ad062463338ba6ddc8f29e5b
| * | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi2018-10-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE am: bc9b060c28 -s ours Change-Id: I604ad890b7bc07180aecb358bd0496276c2d5696
| | * | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ | | | |/ / | | |/| / | | | |/ Change-Id: Ie95fdd6c3a8e9fc953487338567c9b528d1155cf
| | | * Snap for 4628106 from 7dfe7495d581c43e374b01ab9f78cce0093dd302 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_r3android-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_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-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_r2android-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_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 Robot2018-03-012-0/+30
| | | |\ | | | | | | | | | | | | | | | Change-Id: I1ab8f7eef3d008326bab1e08199d47ac1c3d90ca
| | | * \ Snap for 4620899 from a781524ac26ec7dce99c8995e17e7bbd02e534cd to pi-releaseandroid-build-team Robot2018-02-252-2/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | Change-Id: I50bdd918fa0a314d89af33a254799e1d7ff40ce8
| | | * \ \ Snap for 4615953 from 2fbce2ac92d9b193fe6eeeb32fd24ef7182e836c to pi-releaseandroid-build-team Robot2018-02-223-0/+41
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Iacc0e24b7c5b0f501138549266323eb1f1d87cda
| | | * \ \ \ Snap for 4613997 from 0a469a98d0f39ca8a419ac836ac48d6c5d5f2a2e to pi-releaseandroid-build-team Robot2018-02-214-1/+95
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c8f5eb2e9e01d126726df3ffed855c72cd7dc1b
| | | * \ \ \ \ Snap for 4603395 from d91c832f32b4c958074e315174509c008767d06b to pi-releaseandroid-build-team Robot2018-02-144-2/+19
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd1e0caf1dd276945a0fb1bb2eef50ac0c4420d5
| | | * \ \ \ \ \ Snap for 4598635 from 561aa3af9bb437603464d7396c96e9ae7534cf6f to pi-releaseandroid-build-team Robot2018-02-115-20/+54
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2c47b76e04f4f2db2805d19d6dc7c4e631e80e8
| | | * \ \ \ \ \ \ Snap for 4593582 from f20808001f95dff682efdb3a52223822186a674b to pi-releaseandroid-build-team Robot2018-02-082-0/+13
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13b01f05c3501817e02d3ef7ba07af2c5f9d0d84
| | | * \ \ \ \ \ \ \ Snap for 4585119 from 1bda7cccaca980af5bcb17fb66b95ae80ebdb1a4 to pi-releaseandroid-build-team Robot2018-02-054-14/+122
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7777ff508cdb147fb266f109805eb4bca51b01da
| | | * \ \ \ \ \ \ \ \ Snap for 4577102 from 9413b4e18ce4a0927e0ad8b4d7763a1232d4504e to pi-releaseandroid-build-team Robot2018-01-312-4/+31
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6dfb057861aa423383457d22d5e6823e0ba97e1
| | | * \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-290-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Snap for 4571561 from e3f4ec5e34da74dd916208eae944295f7edffeaa to pi-releaseandroid-build-team Robot2018-01-284-15/+17
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id01b645f4644abb6f484bc59cd2a583ab432ae79
| | | * | | | | | | | | | | Snap for 4565898 from 719f4a183c8a4ca49b524df58d98cd42345cf7d0 to pi-releaseandroid-build-team Robot2018-01-251-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic40ee91f849a25f0949ea202563408227df549a9
| | | * \ \ \ \ \ \ \ \ \ \ \ Snap for 4562879 from 372e9100e64c24c89fc0c95547109f5efb7ab5d8 to pi-releaseandroid-build-team Robot2018-01-241-18/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I59a04fac1b88d0ee063e1372e4b32a615db0116e
| | | * \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ merge in pi-release history after reset to mastergitbuildkicker2018-01-220-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Snap for 4557233 from a1571ce244ffb37ce7de123f95dc2ba8a7b26174 to pi-releaseandroid-build-team Robot2018-01-218-5/+194
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0730d62ed96844a9882fdd0ef81d3cee07ab67aa
| | | * | | | | | | | | | | | | | Snap for 4545621 from bcc0e5cf82f18e6afd0ffb6e7f225ab7add4c1c7 to pi-releaseandroid-build-team Robot2018-01-143-1/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id0f6875f870bc47780ec4154433b55bcfa655492
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4535700 from e06f20b944f27371aa743812cd5fb18888a919d2 to pi-releaseandroid-build-team Robot2018-01-101-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id333cb092522cdd5d2527ab95ff1d7a33365d957
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4531101 from 9eb26e0113937243f9b3b0343b94d34324d9a745 to pi-releaseandroid-build-team Robot2018-01-072-1/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b15d40211a05d8ade68d9aba2c707deac018cb0
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4525198 from 47c347109c762905e5498052693e861c882827d6 to pi-releaseandroid-build-team Robot2018-01-041-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3429d539e49ccaaab6cf8bb48f24b4ce96c73ffc
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4517567 from 8a6a294b65c3f9e029405a5a197ad965d9c23dff to pi-releaseandroid-build-team Robot2017-12-242-0/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66eb3b0d8dca9ade4c8bc1979d6980c11861e7da
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 4510491 from 89cccfe6dd74d7d5a0e0793b4d35bac978c6734c to pi-releaseandroid-build-team Robot2017-12-201-2/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic27bf80e5f2697ba0ca734512d185e0c43200dbd