summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6877830 from 850741d2cbbf8c2b921fd3d57079a145dd0607f1 to sdk-...platform-tools-30.0.5sdk-releaseandroid-build-prod (mdb)2020-10-013-7/+5
|\
| * Snap for 6877830 from 850741d2cbbf8c2b921fd3d57079a145dd0607f1 to sdk-releaseandroid-build-prod (mdb)2020-10-013-7/+5
|/|
| * 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix -Wformat error with explicit void* -> char* cast."Treehugger Robot2020-08-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Fix -Wformat error with explicit void* -> char* cast.Stephen Hines2020-08-211-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | 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."Amit Mahajan2020-07-301-4/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | Map the RAT included in ImsSmsMessage to RIL value correctly.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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Update language to comply with Android's inclusive language guidanceSooraj Sasindran2020-07-291-2/+2
| | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | / Merge "change parameter type for 32bit platform" am: f1575d44a9Treehugger Robot2020-07-062-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Snap for 6660490 from f1575d44a910e31bd2a174acd029f55b11c71845 to sdk-...platform-tools-30.0.4android-build-prod (mdb)2020-07-082-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Snap for 6660490 from f1575d44a910e31bd2a174acd029f55b11c71845 to sdk-releaseandroid-build-prod (mdb)2020-07-082-2/+2
|/| | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge "change parameter type for 32bit platform"android-r-beta-3android-r-beta-2Treehugger Robot2020-07-062-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | change parameter type for 32bit platformjinhong.seol2020-07-022-2/+2
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge "Add METADATA to ril: Apache2=NOTICE" am: 8e413723a6Treehugger Robot2020-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 "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: 8c238b...Automerger Merge Worker2020-02-212-0/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Snap for 6533464 from 8e413723a6bfe2628bed5114e472adc34b0b9138 to sdk-...platform-tools-30.0.3platform-tools-30.0.2android-build-prod (mdb)2020-05-271-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Snap for 6533464 from 8e413723a6bfe2628bed5114e472adc34b0b9138 to sdk-releaseandroid-build-prod (mdb)2020-05-271-0/+3
|/| | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge "Add METADATA to ril: Apache2=NOTICE"Treehugger Robot2020-05-011-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Add METADATA to ril: Apache2=NOTICEBob Badour2020-05-011-0/+3
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Snap for 6290619 from 1f9ebb19717e5a1d2dee987ed0edf62b00967cc9 to sdk-...platform-tools-30.0.1platform-tools-30.0.0android-build-prod (mdb)2020-03-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \