summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE - Merge ab/7272582 am: 7bf03e4a7eHEADandroid-s-beta-4android-s-beta-3masterandroid-s-beta-4Xin Li2021-06-140-0/+0
|\
| * DO NOT MERGE - Merge ab/7272582Xin Li2021-06-110-0/+0
| |\
| | * [automerger skipped] Merge RQ2A.210305.007 am: 3f61c3a433 -s ours am: 06e3bbd...temp_ab_7272582Xin Li2021-03-030-0/+0
| | |\
| | * \ [automerger skipped] Merge ab/7061308 into stage. am: 2b3984f394 -s oursXin Li2021-02-230-0/+0
| | |\ \
* | | | | Do not reference LOCAL_PATH in the included files am: 298962393aSasha Smundak2021-06-092-2/+2
|\| | | | | |_|_|/ |/| | |
| * | | Do not reference LOCAL_PATH in the included filesSasha Smundak2021-06-082-2/+2
* | | | [automerger skipped] Merge RQ2A.210305.007 am: 3f61c3a433 -s oursXin Li2021-03-030-0/+0
|\| | | | |_|/ |/| |
| * | Merge RQ2A.210305.007android-s-beta-2android-s-beta-1Xin Li2021-03-036-6/+6
| |\ \ | |/ / |/| |
* | | Merge ab/7061308 into stage.Xin Li2021-02-216-6/+6
|\ \ \ | |/ / |/| / | |/
| * Mark ab/6881855 as merged am: 39af3168ddXin Li2020-11-240-0/+0
| |\ | |/ |/|
* | Mark ab/6881855 as mergedandroid-s-preview-1Xin Li2020-11-230-0/+0
|\ \
| | * [automerger skipped] Skip ab/6749736 in stage. am: 7152b2a099 -s ours am: 1ff...Xin Li2020-10-090-0/+0
| | |\
| | | * [automerger skipped] Skip ab/6749736 in stage. am: 7152b2a099 -s oursXin Li2020-10-090-0/+0
| | | |\ | |_|_|/ |/| | |
* | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \
| | | * | DO NOT MERGE: Update EVS selinux policies am: 06dc00c958Changyeon Jo2020-10-056-6/+6
| | |/| |
| | | * | DO NOT MERGE: Update EVS selinux policiesandroid-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseChangyeon Jo2020-10-026-6/+6
| | * | | Revert "DO NOT MERGE: Include EVS selinux policies" am: a26f94d312Changyeon Jo2020-09-296-6/+6
| | |\| |
| | | * | Revert "DO NOT MERGE: Include EVS selinux policies"android-11.0.0_r30android11-qpr1-c-releaseChangyeon Jo2020-09-286-6/+6
| | * | | DO NOT MERGE: Include EVS selinux policies am: 030a44d91aChangyeon Jo2020-09-286-6/+6
| | |\| |
| | | * | DO NOT MERGE: Include EVS selinux policiesChangyeon Jo2020-09-276-6/+6
| | * | | [automerger skipped] Merge Android R am: 81bd579114 -s ours am: 9362aaa561 -s...Xin Li2020-09-110-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | [automerger skipped] Merge Android R am: 81bd579114 -s ours am: 9362aaa561 -s...Xin Li2020-09-110-0/+0
| | | |\ \
| | | | * \ [automerger skipped] Merge Android R am: 81bd579114 -s ours am: 9362aaa561 -s...Xin Li2020-09-110-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | [automerger skipped] Merge Android R am: 81bd579114 -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge Android RXin Li2020-09-0841-40/+2089
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| | | * | | | [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor...Xin Li2020-09-010-0/+0
| | | |\| | |
| | | | * | | [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor...Xin Li2020-09-010-0/+0
| | | | |\| |
| | | | | * | [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor...Xin Li2020-09-010-0/+0
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage...Xin Li2020-09-0141-40/+2089
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2741-40/+2089
| |\ \ \ \ \ \ \
| | | | | * | | | Rename mainline_system(.*).mk to generic_system(.*).mk am: 1a595e0157 am: e04...JaeMan Park2020-08-312-4/+4
| | | | | |\| | |
| | | | | | * | | Rename mainline_system(.*).mk to generic_system(.*).mk am: 1a595e0157 am: e04...JaeMan Park2020-08-312-4/+4
| | | | | |/| | | | | | | |/| |/ /
| | | | | | * / Rename mainline_system(.*).mk to generic_system(.*).mk am: 1a595e0157 am: e04...JaeMan Park2020-08-312-4/+4
| | | |_|_|/| | | | |/| | |/ / | | | | |/| | | | | |/| | | | | |/| | | | | |/| | | | | |/| | | | | |
* | | | | | | Rename mainline_system(.*).mk to generic_system(.*).mk am: 1a595e0157JaeMan Park2020-08-312-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Rename mainline_system(.*).mk to generic_system(.*).mkJaeMan Park2020-08-282-4/+4
|/ / / / /
| | | * | Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8 am: c93a74b0ae am: 7d1e...Zhaoming Yin2020-06-230-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8 am: c93a74b0aeZhaoming Yin2020-06-230-0/+0
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8Zhaoming Yin2020-06-231-1/+5
| |\ \ \ \
| | | | * | Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8 am: 785ee9be1c am: e69a...Zhaoming Yin2020-06-230-0/+0
| | | | |\|
| | | | | * Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8 am: 785ee9be1cZhaoming Yin2020-06-231-1/+5
| | | | | |\
| | | | * | \ Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8 am: 785ee9be1c am: 2766...Zhaoming Yin2020-06-231-1/+5
| | | | |\ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8 am: 785ee9be1cZhaoming Yin2020-06-231-1/+5
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Fixed crosshatch_car_hwsan build issue am: 5e43ba5dd8android-11.0.0_r16android11-d1-b-releaseZhaoming Yin2020-06-231-1/+5
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Fixed crosshatch_car_hwsan build issueandroid11-devZhaoming Yin2020-06-191-1/+5
| | | | | * | [automerger skipped] Merge QQ3A.200605.002 into master am: dc1c9c4bff -s ours...Xin Li2020-06-080-0/+0
| | | | | |\ \ | | | | |_|/ / | | | |/| | |
| | | * | | | [automerger skipped] Merge QQ3A.200605.002 into master am: dc1c9c4bff -s ours...Xin Li2020-06-080-0/+0
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | [automerger skipped] Merge QQ3A.200605.002 into master am: dc1c9c4bff -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | [automerger skipped] Merge QQ3A.200605.002 into master am: dc1c9c4bff -s oursXin Li2020-06-080-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge QQ3A.200605.002 into masterandroid-r-beta-3android-r-beta-2Xin Li2020-06-0313-0/+831
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| | | | | | * | Disable userspace reboot am: 0ac8af6348 am: cc981498ff am: 7802e98cc3Nikita Ioffe2020-06-020-0/+0
| | | | | | |\ \ | | | | | |_|/ / | | | | |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 14:57:28 +0000