| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Mark ab/7061308 as merged in stage.HEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4 | Xin Li | 2021-02-20 | 0 | -0/+0 |
| |\ | |||||
| | * | Mark ab/6881855 as merged am: 7b9758c25f | Xin Li | 2020-11-25 | 0 | -0/+0 |
| | |\ | |||||
| | * \ | Merge "Cleanup references to system/core/base -> system/libbase" am: 36e40475... | Baligh Uddin | 2020-10-24 | 3 | -3/+3 |
| | |\ \ | |||||
| | | * \ | Merge "Cleanup references to system/core/base -> system/libbase" am: 36e40475... | Baligh Uddin | 2020-10-24 | 3 | -3/+3 |
| | | |\ \ | |||||
| | * | | | | [automerger skipped] Skip ab/6749736 in stage. am: 30c8fc1fe4 -s ours am: 83f... | Xin Li | 2020-10-09 | 0 | -0/+0 |
| | |\| | | | |||||
| | | * | | | [automerger skipped] Skip ab/6749736 in stage. am: 30c8fc1fe4 -s ours | Xin Li | 2020-10-09 | 0 | -0/+0 |
| | | |\ \ \ | |||||
| * | | \ \ \ | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display" am: e5a9b1d7e7 | Bob Badour | 2021-02-19 | 97 | -6/+331 |
| |\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| | * | | | | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display" | Bob Badour | 2021-02-18 | 97 | -6/+331 |
| |/| | | | | | |||||
| | * | | | | | [LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/display | Bob Badour | 2021-02-12 | 97 | -6/+331 |
| |/ / / / / | |||||
| * | | | / | Mark ab/6881855 as mergedandroid-s-preview-1 | Xin Li | 2020-11-23 | 0 | -0/+0 |
| |\| | | | | |_|_|/ |/| | | | |||||
| | * | | | [automerger skipped] Merge "Merge Android R" am: 68f708491a -s ours am: 7f96e... | Xin Li | 2020-09-11 | 0 | -0/+0 |
| | |\| | | |||||
| | | * | | [automerger skipped] Merge "Merge Android R" am: 68f708491a -s ours am: 7f96e... | Xin Li | 2020-09-11 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | [automerger skipped] Merge "Merge Android R" am: 68f708491a -s ours am: 7f96e... | Xin Li | 2020-09-11 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | * | | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270... | Xin Li | 2020-09-01 | 0 | -0/+0 |
| | |\| | | | | |||||
| | | * | | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270... | Xin Li | 2020-09-01 | 0 | -0/+0 |
| | | |\| | | | |||||
| | | | * | | | [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@669270... | Xin Li | 2020-09-01 | 0 | -0/+0 |
| | | | |\ \ \ | |||||
| | * | | \ \ \ | Merge "[automerger skipped] hwc2: add locks for callback functions am: 9bac9d... | Automerger Merge Worker | 2020-07-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s... | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s...android-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_r30android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-c-releaseandroid11-d2-release | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ | |||||
| | * | | \ \ \ \ \ \ | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s... | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s... | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | hwc2: add locks for callback functions am: ccf7cd3bf2 am: 3be6da93f1 am: cd29... | Chris Lu | 2020-07-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge "hwc2: add locks for callback functions am: ccf7cd3bf2 am: 37864da18f a... | Automerger Merge Worker | 2020-07-01 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | hwc2: add locks for callback functions am: ccf7cd3bf2 am: 37864da18f am: 9b0b... | Chris Lu | 2020-07-01 | 3 | -7/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ | hwc2: add locks for callback functions am: ccf7cd3bf2 am: 3be6da93f1 am: 16b6... | Chris Lu | 2020-07-01 | 3 | -7/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | / / / / / / | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | | hwc2: add locks for callback functions am: ccf7cd3bf2 am: 3be6da93f1 | Chris Lu | 2020-07-01 | 3 | -7/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ | Merge "Add METADATA to display: BSD+Apache2=NOTICE" am: bdcf2543d7 am: 427cda... | Treehugger Robot | 2020-05-05 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st... | Xin Li | 2020-04-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "fix -Wunreachable-code-loop-increment" am: 624a8528a8 am: 530debeb50 a... | Treehugger Robot | 2020-03-20 | 3 | -102/+69 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | sdm: Add HAL_PIXEL_FORMAT_NV21_ZSL support in GetSDMFormat am: 625dbe2ba7 am:... | Arun Kumar K R | 2020-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | sdm: Add HAL_PIXEL_FORMAT_NV21_ZSL support in GetSDMFormat am: 625dbe2ba7 am:... | Arun Kumar K R | 2020-03-20 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | sdm: Add HAL_PIXEL_FORMAT_NV21_ZSL support in GetSDMFormat am: 625dbe2ba7 am:... | Arun Kumar K R | 2020-03-20 | 1 | -1/+2 |
| | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | sdm: Add HAL_PIXEL_FORMAT_NV21_ZSL support in GetSDMFormat am: 625dbe2ba7 am:... | Arun Kumar K R | 2020-03-20 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | sdm: Add HAL_PIXEL_FORMAT_NV21_ZSL support in GetSDMFormat am: 625dbe2ba7 am:... | Arun Kumar K R | 2020-03-20 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901... | Xin Li | 2020-03-19 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT M... | Automerger Merge Worker | 2020-03-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am... | Automerger Merge Worker | 2020-03-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge "Cleanup references to system/core/base -> system/libbase" am: 36e404753a | Baligh Uddin | 2020-10-24 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Merge "Cleanup references to system/core/base -> system/libbase" | Baligh Uddin | 2020-10-24 | 3 | -3/+3 |
| |/| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | Cleanup references to system/core/base -> system/libbase | Baligh Uddin | 2020-10-23 | 3 | -3/+3 |
| |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | Skip ab/6749736 in stage. | Xin Li | 2020-10-08 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s... | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s... | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | [automerger skipped] hwc2: add locks for callback functions am: 9bac9d39bb -s...android-11.0.0_r16android11-d1-b-release | Chris Lu | 2020-07-02 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | hwc2: add locks for callback functions am: ccf7cd3bf2 am: 3be6da93f1 | Chris Lu | 2020-07-01 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | hwc2: add locks for callback functions am: ccf7cd3bf2 | Chris Lu | 2020-07-01 | 3 | -7/+19 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | hwc2: add locks for callback functions am: ccf7cd3bf2 am: 37864da18f | Chris Lu | 2020-07-01 | 3 | -7/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge "Add METADATA to display: BSD+Apache2=NOTICE" am: bdcf2543d7 am: 427cda... | Treehugger Robot | 2020-05-05 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st... | Xin Li | 2020-04-10 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge "fix -Wunreachable-code-loop-increment" am: 624a8528a8 am: 530debeb50 a... | Treehugger Robot | 2020-03-20 | 3 | -102/+69 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||||
