summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark ab/7061308 as merged in stage.HEADandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-4Xin Li2021-02-200-0/+0
|\
| * Mark ab/6881855 as merged am: 266defdc03Xin Li2020-11-240-0/+0
| |\ | |/ |/|
* | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \
| | * Remove xr directory am: 771c2254b9 am: 9baf655e38 am: 8fd689c67fColin Cross2020-10-1415-463/+0
| |/|
| | * Remove xr directory am: 771c2254b9 am: 9baf655e38Colin Cross2020-10-1415-463/+0
| | |\ | |_|/ |/| |
* | | Remove xr directory am: 771c2254b9Colin Cross2020-10-1415-463/+0
|\ \ \
| * | | Remove xr directoryColin Cross2020-10-1315-463/+0
| | * | [automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc -s...Xin Li2020-09-110-0/+0
| | |\|
| | | * [automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc -s...Xin Li2020-09-110-0/+0
| | | |\
| | | | * [automerger skipped] Merge Android R am: b85105e946 -s ours am: fafa1b08dc -s...Xin Li2020-09-110-0/+0
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | [automerger skipped] Merge Android R am: b85105e946 -s oursXin Li2020-09-110-0/+0
|\| | | |
| * | | | Merge Android RXin Li2020-09-0815-0/+463
| |\ \ \ \ | |/ / / / |/| | | |
| | * | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |\| |
| | | * | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |/| | | | | |/
| | | * [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270...Xin Li2020-09-010-0/+0
| | |/| | |_|/ |/| |
* | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2715-0/+463
|\ \ \ | |/ / |/| / | |/
| * [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-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-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-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 Li2019-10-300-0/+0
| |\ | |/ |/|
* | DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2android-r-beta-3android-r-beta-2Xin Li2019-10-300-0/+0
|\ \
| * \ DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| |\ \
| | | * Skip QD1A.190821.011 in stage-aosp-master am: 4f104c9f70 am: 461c4c31b5Xin Li2019-10-160-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Skip QD1A.190821.011 in stage-aosp-master am: 4f104c9f70Xin Li2019-10-160-0/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| |\| |
| | * | Skip QD1A.190821.011 in stage-aosp-masterXin Li2019-10-160-0/+0
| | |\ \
| | | * \ Snap for 5674532 from 78d7565d394a816dcd9f49981056e3ce73b24bae to qt-c2f2-rel...android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot2019-06-201-0/+16
| | | |\ \
| | | | | * Turn the lock screen off by default.Grant Yoshida2019-09-132-0/+9
| | | | | * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| |\| | | |
| | * | | | Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | |\ \ \ \
| | | | | | * [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d0da96f2...Xin Li2019-09-050-0/+0
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d0da96f2...Xin Li2019-09-050-0/+0
|\| | | | | | | |_|/ / / / |/| | | | |
| * | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d0da96f2...Xin Li2019-09-050-0/+0
|/| | | | |
| * | | | | [automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-050-0/+0
| |\| | | |
| | * | | | DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li2019-09-042-0/+17
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | | | | * Add a custom overlay for SetupWizardOverlay, SetupWizardOverlayXr.Grant Yoshida2019-09-035-0/+181
| | | | | * Update boot-to-vr.sh to replace the init.xr.rc file.Grant Yoshida2019-08-231-1/+6
| | | | | * Fix bluetooth not working on the OnePlus7 Pro.Grant Yoshida2019-08-212-0/+21
| | | | | * Merge "Move boot-to-vr.sh to device/google/vrservices."TreeHugger Robot2019-08-202-1/+75
| | | | | |\
| | | | | | * Move boot-to-vr.sh to device/google/vrservices.Grant Yoshida2019-08-202-1/+75
| | | | | * | Fix some additional selinux errors.Grant Yoshida2019-08-192-0/+2
| | | | | * | Fix GSI selinux policies.Grant Yoshida2019-08-193-1/+3
| | | | | |/
| | | | | * Merge "Adding in system property to ignore sensor change for pluggy build."Mike Ma2019-08-161-0/+1
| | | | | |\
| | | | | | * Adding in system property to ignore sensor change for pluggy build.mamik2019-08-151-0/+1
| | | | | * | Merge "Add SELinux rules that are common to XR devices."Grant Yoshida2019-08-163-0/+15
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * Add SELinux rules that are common to XR devices.Grant Yoshida2019-07-193-0/+15
| | | | | * | Merge "Copy XR config files to system image instead of vendor image"TreeHugger Robot2019-08-101-3/+4
| | | | | |\ \
| | | | | | * | Copy XR config files to system image instead of vendor imageJiwen 'Steve' Cai2019-08-091-3/+4
| | | | | * | | Merge changes from topic "gsi_xr_master"TreeHugger Robot2019-08-091-0/+105
| | | | | |\ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | | * | Set ro.surface_flinger.use_vr_flinger for XR targetsJiwen 'Steve' Cai2019-07-171-0/+1
| | | | | | * | Add init.xr.rc.Grant Yoshida2019-07-171-0/+104
| | | | | | |/