summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Rename mainline_system(.*).mk to generic_system(.*).mk" am: 9d39cf5354HEADmasterJaeMan Park2020-09-076-6/+6
|\
| * Merge "Rename mainline_system(.*).mk to generic_system(.*).mk"JaeMan Park2020-09-076-6/+6
| |\
| | * Rename mainline_system(.*).mk to generic_system(.*).mkJaeMan2020-08-286-6/+6
| |/
* | Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li2020-08-270-0/+0
|\ \ | |/ |/|
| * [automerger skipped] Merge "Use inclusive language for PRODUCT_ARTIFACT_PATH_...Colin Cross2020-06-240-0/+0
| |\
| * \ Merge "Clean up device/generic/common/nfc/libnfc-nci.conf usages" am: 724dd47...Treehugger Robot2020-06-233-9/+0
| |\ \
| * \ \ Use inclusive language for PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST am:...Colin Cross2020-06-181-1/+1
| |\ \ \
| | * | | Use inclusive language for PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LISTandroid11-devColin Cross2020-06-131-1/+1
| * | | | [automerger skipped] Add Goldfish to soong name spaces of MGSI products am: a...Isaac Chen2020-06-040-0/+0
| |\| | |
| | * | | Add Goldfish to soong name spaces of MGSI productsIsaac Chen2020-06-034-0/+5
| * | | | Merge "Add Goldfish to soong name spaces of MGSI products" am: 9640e4a5a4 am:...Isaac Chen2020-06-024-0/+5
| |\ \ \ \
| * \ \ \ \ [automerger skipped] Add Goldfish to soong name spaces of CSI products am: cc...Isaac Chen2020-05-270-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Add Goldfish to soong name spaces of CSI productsIsaac Chen2020-05-272-0/+4
| * | | | | Merge "Add Goldfish to soong name spaces of CSI products" am: ba88849f3c am: ...Treehugger Robot2020-05-252-0/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge "Add METADATA to common: Apache2=NOTICE" am: 38b61659e3 am: a11ccda1c9Treehugger Robot2020-05-051-0/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [automerger skipped] Merge "CSI to use framework's fallback home activity" am...Isaac Chen2020-04-290-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ CSI to use framework's fallback home activity am: d27f9dd2f8Isaac Chen2020-04-153-0/+31
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | CSI to use framework's fallback home activityIsaac Chen2020-04-083-0/+31
| * | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "Fix csi_x86 build failure" am: 32181a0ba4 am: 754ecb765b am: c2b390f200Isaac Chen2020-02-181-2/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Create bootable CSI products" am: b4998d388e am: b48e540bf0 am: 6c0455...Automerger Merge Worker2020-01-213-0/+102
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Remove init.zygote*.rc from whitelist" am: 6431cd0fc3 am: 80c159aa90Justin Yun2019-10-313-21/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix some mgsi issues and add some basic functions" am: e9dfdaa239 am: ...Isaac Chen2019-10-171-0/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: 9ffe8f66c6 am: f89fb6538eXin Li2019-10-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "WLAN/radio workaround for old Pixel phones" am: 04c10eba18 am: cd9403a...Isaac Chen2019-10-161-0/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Move skip mount config to system_ext" am: b5bd420b62 am: 5e12e443b1 am...Isaac Chen2019-09-241-8/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add VNDK 29 libraries for MGSI" am: 2e0e08e349 am: 8c573d2e5e am: 55f9...Isaac Chen2019-09-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix build break for target build_test at 5861631" am: e4410af408 am: d...Hector Dearman2019-09-092-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add Minimal GSI (MGSI) products" am: aeeb95f99d am: e3b110532d am: 3e7...Isaac Chen2019-09-0916-0/+487
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-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 build QP1A.190711.019 into stage-ao...Xin Li2019-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge build QP1A.190711.001 into stage-ao...Xin Li2019-08-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Set default polling mask and p2p listen mask am: e6c742033e am: 93017a...Jack Yu2019-07-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Set default polling mask and p2p listen mask am: e6c742033e am: 06c6585077Jack Yu2019-07-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Retire device/generic/common/nfc/libnfc-nci.conf" am: b1cb67f6e4Yo Chiang2020-07-211-82/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Retire device/generic/common/nfc/libnfc-nci.conf"Yo Chiang2020-07-211-82/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Retire device/generic/common/nfc/libnfc-nci.confYo Chiang2020-07-051-82/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | / Merge "Use inclusive language for PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_L...Colin Cross2020-06-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use inclusive language for PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_L...android-r-beta-3android-r-beta-2Colin Cross2020-06-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | Use inclusive language for PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LISTColin Cross2020-06-241-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | |
* | / | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up device/generic/common/nfc/libnfc-nci.conf usages" am: 724dd47c7bTreehugger Robot2020-06-233-9/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Clean up device/generic/common/nfc/libnfc-nci.conf usages"Treehugger Robot2020-06-233-9/+0
|/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Clean up device/generic/common/nfc/libnfc-nci.conf usagesYo Chiang2020-06-233-9/+0
|/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add Goldfish to soong name spaces of MGSI products" am: 9640e4a5a4Isaac Chen2020-06-024-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Add Goldfish to soong name spaces of MGSI products"Isaac Chen2020-06-024-0/+5
|/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Add Goldfish to soong name spaces of MGSI productsIsaac Chen2020-06-014-0/+5
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add Goldfish to soong name spaces of CSI products" am: ba88849f3cTreehugger Robot2020-05-252-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 17:58:02 +0000