summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/PartnerBookmarksPr...android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour2021-02-192-0/+8
|\
| * Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/providers/PartnerBookmarksPr...Bob Badour2021-02-192-0/+8
|/|
| * [LSC] Add LOCAL_LICENSE_KINDS to packages/providers/PartnerBookmarksProviderBob Badour2021-02-122-0/+8
|/
* Merge stage-aosp-master into pi-dev-plus-aospandroid-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-s-preview-1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-r-beta-3android-r-beta-2android-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_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-platform-11.0.0_r10android-platform-11.0.0_r1android-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_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-mainline-10.0.0_r9android-mainline-10.0.0_r4android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r5android-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_r4android-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_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-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_r10android-11.0.0_r1android-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-r21android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-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-platform-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-gsiandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-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-250-0/+0
|\
| * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\
| | * 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
| | |\
* | | | Merge "Add default code reviewers into OWNERS" am: 8e526a48b6 am: 1ff1c58168Chih-hung Hsieh2019-01-181-0/+3
|\| | |
| * | | Merge "Add default code reviewers into OWNERS" am: 8e526a48b6Chih-hung Hsieh2019-01-181-0/+3
| |\| | | | |/ | |/|
| | * Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-181-0/+3
| | |\
| | | * Merge "Add default code reviewers into 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 Hsieh2019-01-181-0/+3
| | | |\
| | | | * Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-181-0/+3
| | | |/
* | | | Merge "Convert Android.mk file to Android.bp." am: 4a5064b387 am: e9213fdd05Sasha Smundak2019-01-094-65/+50
|\| | |
| * | | Merge "Convert Android.mk file to Android.bp." am: 4a5064b387Sasha Smundak2019-01-094-65/+50
| |\| |
| | * | Merge "Convert Android.mk file to Android.bp."Sasha Smundak2019-01-094-65/+50
| | |\|
| | | * Merge "Convert Android.mk file to Android.bp."Treehugger Robot2019-01-094-65/+50
| | | |\
| | | | * Convert Android.mk file to Android.bp.Sasha Smundak2019-01-084-65/+50
| | | |/
* | | | [automerger skipped] Merge "DO NOT MERGE" am: b8231336ae -s ours am: f74c616...Xin Li2018-12-100-0/+0
|\| | |
| * | | [automerger skipped] Merge "DO NOT MERGE" am: b8231336ae -s oursXin Li2018-12-100-0/+0
| |\| |
| | * | [automerger skipped] Merge "DO NOT MERGE"Xin Li2018-12-100-0/+0
| | |\|
| | | * Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot2018-12-100-0/+0
| | |/|
| | | * DO NOT MERGEXin Li2018-12-070-0/+0
| | |/|
| | | * Snap for 4620899 from 1f38803dbc74330cc46050eb7a6763b811219576 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_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_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_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_r2android-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 Robot2018-02-252-1/+3
| | | |\
| | | * \ Snap for 4509671 from ef814aa2329f69d83af0e22bf0c542448e4feac1 to pi-releaseandroid-build-team Robot2017-12-190-0/+0
| | | |\ \
| | | * \ \ Merge cherrypicks of [3379158, 3379159, 3378943] into pi-releaseandroid-build-team Robot2017-12-181-1/+2
| | | |\ \ \
| | | | * | | Set android:exported=true for PartnerBookmarksProvider.Sudheer Shanka2017-12-181-1/+2
| | | |/ / /
| | | * | | Snap for 4507345 from bfa60eef17d4be6564e7d5528e50930195fc3fd8 to pi-releaseandroid-build-team Robot2017-12-174-3/+5
| | | |\ \ \
| | | * \ \ \ Snap for 4489599 from 394c62c34ef02f20ab8ec2a98db18a9290bbcdd2 to pi-releaseandroid-build-team Robot2017-12-071-1/+1
| | | |\ \ \ \
* | | | | | | | Merge "Merge Android Pie into master" am: 3a6cc4e2ba am: e8d0533421 am: 427a5...Xin Li2018-08-080-0/+0
|\| | | | | | |
| * | | | | | | Merge "Merge Android Pie into master" am: 3a6cc4e2ba am: e8d0533421Xin Li2018-08-070-0/+0
| |\| | | | | |
| | * | | | | | Merge "Merge Android Pie into master" am: 3a6cc4e2baandroid-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-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-n-iot-release-ihome-igv1nougat-iot-releaseXin Li2018-08-070-0/+0
| |/| | | | | |
| | * | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-070-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Merge Android Pie into master"android-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 Li2018-08-074-4/+7
| | | |\ \ \ \ \ \
| | | | * | | | | | Merge Android Pie into masterXin Li2018-08-064-4/+7
| | | |/| | | | | | | | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 76e63b0e31Xin Li2018-06-090-0/+0
|\| | | | | | | | | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-090-0/+0
|/| | | | | | | | |/ / / / / /
| * | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-084-4/+7
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION whe...android-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-devAnton Hansson2018-02-230-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION whe...Anton Hansson2018-02-232-1/+3
| |\| | | | | | | | |_|/ / / / | |/| | | | |
| | * | | | | Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION whe...Anton Hansson2018-02-232-1/+3
| |/| | | | | | | |/ / / /
| | * | | | Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION whe...android-wear-p-preview-2android-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-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7Anton Hansson2018-02-232-1/+3
| |/| | | |
| | * | | | packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where poss...Anton Hansson2018-02-232-1/+3
| |/ / / /
* | | | / packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where poss...Anton Hansson2018-02-232-1/+3
| |_|_|/ |/| | |
* | | | Set android:exported=true for PartnerBookmarksProvider.Sudheer Shanka2017-12-181-1/+2
| |_|/ |/| |
* | | Remove uses-sdk, target platform API level.Przemyslaw Szczepaniak2017-12-144-3/+5
| |/ |/|
* | Flatten dependency hierarchy of legacy-android-testPaul Duffin2017-12-051-1/+1
|/
* Merge "Fix dependencies of packages that target earlier releases" am: 133b4fb...android-wear-8.0.0_r1oreo-mr1-devPaul Duffin2017-06-141-2/+2
|\
| * Merge "Fix dependencies of packages that target earlier releases" am: 133b4fb...android-o-mr1-iot-preview-6o-mr1-iot-preview-6Paul Duffin2017-06-141-2/+2
|/|
| * Merge "Fix dependencies of packages that target earlier releases" am: 133b4fb575android-o-mr1-preview-2android-o-mr1-preview-1Paul Duffin2017-06-141-2/+2
|/|
| * Merge "Fix dependencies of packages that target earlier releases"Paul Duffin2017-06-141-2/+2
| |\
| | * Merge "Fix dependencies of packages that target earlier releases"android-o-preview-4android-o-iot-preview-5o-iot-preview-5Paul Duffin2017-06-141-2/+2
| |/|