summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge Android R"HEADmasterXin Li2020-09-102-1/+131
|\
| * Merge Android RXin Li2020-09-082-1/+131
|/|
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-272-1/+131
|/|
| * [automerger skipped] Add product partition file support am: 9feca325c6 -s our...Bill Yi2020-05-220-0/+0
| |\
| | * [automerger skipped] Add product partition file support am: 9feca325c6 -s oursandroid11-devBill Yi2020-05-220-0/+0
| | |\
| | | * Add product partition file supportBill Yi2020-05-221-1/+1
| * | | Merge "Add METADATA to common: Apache2=NOTICE" am: fbf7976b6a am: 7cc154a9e8Treehugger Robot2020-05-051-0/+3
| |\ \ \
| * \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \
| * \ \ \ \ Add product partition file support am: 8e95629656Bill Yi2020-04-091-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add product partition file supportBill Yi2020-04-091-1/+1
| * | | | | generate-android-bp-for-blobs.sh: Add module owner am: be215f3e48Yo Chiang2020-04-011-0/+4
| |\| | | |
| | * | | | generate-android-bp-for-blobs.sh: Add module ownerYo Chiang2020-03-311-0/+4
| * | | | | Add script to generate Android.bp for AOSP blob am: 47704561dfYo Chiang2020-03-272-0/+126
| |\| | | |
| | * | | | Add script to generate Android.bp for AOSP blobYo Chiang2020-03-262-0/+126
| * | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Merge "Merge stage-aosp-master to aosp-master - DO NOT M...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Add support for floral path sytem_ext am: 5800480acaAutomerger Merge Worker2020-02-261-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Add support for floral path sytem_extBill Yi2020-02-251-1/+1
| |/ / / / / / /
| * | | | | | | [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendo...Automerger Merge Worker2020-01-160-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [automerger skipped] Copy Android.mk for all vendors am: a766aad799 -s ours a...Automerger Merge Worker2019-12-030-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Create LICENSE file automatically." am: 5664689ad1 am: 587fc20905Xin Li2019-11-121-0/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Copy Android.mk for all vendorsBill Yi2019-11-051-5/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge Coral/Flame into AOSP master am: 401b47878c -s our...Xin Li2019-10-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: f456b5a32c am: 39a110a330Xin Li2019-10-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add coral/flame support in common scripts am: 86679dc4aaBill Yi2019-06-061-12/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.1...Xin Li2019-05-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.00...Xin Li2019-05-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master...Xin Li2019-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: 5...Xin Li2019-05-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot2020-07-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "Update language to comply with Android's inclusive language guidance"Treehugger Robot2020-07-291-1/+1
|/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Update language to comply with Android's inclusive language guidancemarkchien2020-07-291-1/+1
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Add METADATA to common: Apache2=NOTICE" am: fbf7976b6aandroid-r-beta-3android-r-beta-2Treehugger Robot2020-05-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge "Add METADATA to common: Apache2=NOTICE"Treehugger Robot2020-05-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Add METADATA to common: Apache2=NOTICEBob Badour2020-05-011-0/+3
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 1332d8b985 ...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 1332d8b985Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"android-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-051-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge stage-aosp-master to aosp-master - DO NOT MERGE am: ca8c185bc6 am: 591d...Automerger Merge Worker2020-03-060-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: ca8c185bc6Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGEBill Yi2020-03-051-5/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stag...Automerger Merge Worker2020-01-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |