summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| |\
* | | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 857...Xin Li2019-02-200-0/+0
|\| |
| * | [automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-200-0/+0
| |\ \
| | * \ DO NOT MERGE - Merge PPRL.190205.001 into masterXin Li2019-02-181-1/+6
| | |\ \ | | |/ / | |/| |
* | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-140-0/+0
|\| | | | |_|/ |/| |
| * | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-ma...Xin Li2019-02-121-1/+6
| |\ \
| | * \ Snap for 5180536 from 956419013f169f756404de89aad50c75d3b02bde to pi-platform...android-build-team Robot2019-02-091-1/+6
| | |\ \
| | | * \ Snap for 5044688 from f5db01c3b14d720f3d603cfb3b887d89c2b11b28 to pi-qpr2-rel...android-build-team Robot2018-10-021-1/+6
| | | |\ \
* | | | | | Remove unused variable. am: 30d1d22c70Dan Albert2018-12-131-1/+0
|\| | | | |
| * | | | | Remove unused variable.Dan Albert2018-12-131-1/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Remove unused variable.Dan Albert2018-12-121-1/+0
* | | | | | [automerger skipped] DO NOT MERGE am: 1dcb951d11 -s oursXin Li2018-12-050-0/+0
|\| | | | |
| * | | | | [automerger skipped] DO NOT MERGEXin Li2018-12-050-0/+0
| |\| | | |
| | * | | | DO NOT MERGEXin Li2018-12-050-0/+0
| | |\| | |
| | | * | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-281-1/+1
| | | |\| |
* | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\| | | |
| | * | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\| | |
* | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
|\| | | | |
| * | | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Snap for 4722539 from f6877997980a1a594d495457cee2dac91f6a5534 to pi-releaseandroid-build-team Robot2018-04-151-1/+4
| | |\ \ \ \
| | * \ \ \ \ Snap for 4496165 from ea07592c30a87d555049d70807b09f9b7151cf2e to pi-releaseandroid-build-team Robot2017-12-110-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Snap for 4453288 from 39b7da6a8a76ba426d1a3f82b1599df88e3dc9ad to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Snap for 4429796 from 287524db3f7710958b1d45dcdfe27455c7082930 to pi-releaseandroid-build-team Robot2017-11-021-1/+3
| | |\ \ \ \ \ \ \
* | | | | | | | | | Merge pi-dr1-dev to aosp-master am: a5df18f6a0Bill Yi2018-10-190-0/+0
|\| | | | | | | | |
| * | | | | | | | | Merge pi-dr1-dev to aosp-masterBill Yi2018-10-190-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge pi-dr1-dev to aosp-masterBill Yi2018-10-191-1/+1
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | bootcontrol: Add TARGET_USES_HARDWARE_QCOM_BOOTCTRLAndrew Chant2018-08-281-1/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | bootcontrol: Add TARGET_USES_HARDWARE_QCOM_BOOTCTRLAndrew Chant2018-08-271-1/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge stage-dr1-aosp-master into stage-aosp-masterXin Li2018-08-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge stage-dr1-aosp-master into stage-aosp-masterXin Li2018-08-131-1/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge Android Pie into master am: 8a744d061b am: 033dcaf9d7Xin Li2018-08-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge Android Pie into master am: 8a744d061bXin Li2018-08-070-0/+0
|/| | | | | | | | | | |/ / / / / / / /
| * | | | | | | | Merge Android Pie into masterXin Li2018-08-070-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge Android Pie into masterXin Li2018-08-061-1/+4
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li2018-07-190-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li2018-07-191-1/+1
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
* | | | | | | | | Android.mk: add sdm710Roger Liao2018-07-171-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Android.mk: add sdm710Roger Liao2018-07-131-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | 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-081-1/+4
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | bootcontrol: return error if set active for partitions failsFernando Lugo2018-04-121-1/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | bootcontrol: return error if set active for partitions failsFernando Lugo2018-04-121-1/+4
|/ / / / / /
* | | | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | DO NOT MERGE: Merge Oreo MR1 into master am: bb80b0f386 -s oursXin Li2017-12-070-0/+0
| |\| | | |
| | * | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\| | |
| | | * | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-062-4/+4
| | | |\ \ \ | | | |/ / / | | |/| | |
* | | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-150-0/+0
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| |\| | |