summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Mark ab/6881855 as mergedHEADmasterXin Li2020-11-230-0/+0
|\
| * [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| |\
| | * [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | |\
| | | * [automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709...Xin Li2020-08-270-0/+0
| | | |\
| * | | | Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ...Treehugger Robot2020-08-211-1/+1
| |\| | |
| | * | | Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ...Treehugger Robot2020-08-211-1/+1
| | |\| |
| | | * | Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04 ...Treehugger Robot2020-08-211-1/+1
| | | |\ \
| * | | | | Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: d04...Amit Mahajan2020-07-301-4/+2
| |\| | | |
| * | | | | Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot2020-07-291-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge "change parameter type for 32bit platform" am: f1575d44a9 am: ca26310e0...Treehugger Robot2020-07-062-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6 am: 662ce93413 am:...Treehugger Robot2020-05-011-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [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 "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly" am: ...Treehugger Robot2020-10-271-3/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Merge "Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctly"Treehugger Robot2020-10-271-3/+8
|/| | | | | | | | | | |
| * | | | | | | | | | | Map RIL_RadioTechnologyFamily to RadioTechnologyFamily correctlyTaesu Lee2020-10-231-3/+8
|/ / / / / / / / / / /
* | | | | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: d04...Amit Mahajan2020-07-301-4/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | / / | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge "Map the RAT included in ImsSmsMessage to RIL value correctly." am: d04...Amit Mahajan2020-07-301-4/+2
| | |\ \ \ \ \ \ \
| * | | | | | | | | Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot2020-07-291-2/+2
| |\| | | | | | | | | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge "Update language to comply with Android's inclusive language guidance" ...Treehugger Robot2020-07-291-2/+2
| | |\ \ \ \ \ \ \
| * | | | | | | | | Merge "change parameter type for 32bit platform" am: f1575d44a9 am: ca26310e0...Treehugger Robot2020-07-062-2/+2
| |\| | | | | | | | | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6 am: 662ce93413 am:...Treehugger Robot2020-05-011-0/+3
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | [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
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li2020-08-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge "change parameter type for 32bit platform" am: f1575d44a9 am: ca26310e0cTreehugger Robot2020-07-062-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6 am: 662ce93413Treehugger Robot2020-05-011-0/+3
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | [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
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | [automerger skipped] Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastC...android-mainline-11.0.0_r4android-mainline-11.0.0_r3android-mainline-11.0.0_r2android-mainline-11.0.0_r1android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-devandroid11-d1-b-releaseAutomerger Merge Worker2020-02-210-0/+0
| |\ \ \ \ \ \ \
| * | | | | | | | Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfoSarah Chin2020-02-042-0/+13
| * | | | | | | | [automerger skipped] Merge "Add dbright to OWNERS file" am: 02ed800d62 am: e3...Automerger Merge Worker2020-01-090-0/+0
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add dbright to OWNERS fileDaniel Bright2020-01-071-1/+2
| * | | | | | | | | Merge "Encode MCC with 3 digit in CellIdentity" am: 61d7c1ccd0 am: 86d6ae7ca4...Automerger Merge Worker2019-12-192-8/+81
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge "Fix typo" am: 11b162a4cd am: f1aa3222d1Taesu Lee2019-12-021-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge "Add sarahchin to OWNERS" am: 2d39acdbe2 am: 273a822d97 am: 9b8fb3b36cSarah Chin2019-10-181-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Skip QD1A.190821.011 in stage-aosp-master am: 7fff9c2f04 am: 8c97bd2121Xin Li2019-10-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove libhwbinder/libhidltransport deps" am: bf7fd5c828 am: ee61593d2...Steven Moreland2019-10-021-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ [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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove unused includes." am: a09c048365 am: 6b4a906988 am: 74152cc172 ...Elliott Hughes2019-08-081-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add RIL_UNSOL_KEEPALIVE_STATUS in ril_unsol_commands.h am: 2093efa562 am: 375...Gary Jian2019-06-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add RIL_UNSOL_KEEPALIVE_STATUS in ril_unsol_commands.h am: 2093efa562 am: cff...Gary Jian2019-06-131-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5406228 into qt-dev. am: 43a35059b9Bill Rassieur2019-04-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5406228 into qt-dev.Bill Rassieur2019-04-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge master@5406228 into qt-dev.Bill Rassieur2019-03-281-2/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix -Wformat error with explicit void* -> char* cast." am: 180d9e2e04Treehugger Robot2020-08-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | |