summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-087-66/+128
|\
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-277-66/+128
|/|
| * Do not allow ONS to be stopped by other apps am: 5a85287addSooraj Sasindran2020-06-081-1/+1
| |\
| | * Do not allow ONS to be stopped by other appsandroid11-devSooraj Sasindran2020-06-061-1/+1
| * | [automerger skipped] Merge QQ3A.200605.002 into master am: d5997fad37 -s ours...Xin Li2020-06-080-0/+0
| |\ \ | |/ / |/| |
* | | [automerger skipped] Merge QQ3A.200605.002 into master am: d5997fad37 -s oursXin Li2020-06-080-0/+0
|\ \ \
| * \ \ Merge QQ3A.200605.002 into masterandroid-r-beta-3android-r-beta-2Xin Li2020-06-032-9/+5
| |\ \ \ | |/ / / |/| | |
| | * | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ \
| * \ \ \ Merge "Fix wrong service name" am: 4bb98285c9 am: 349f80d82cTreehugger Robot2020-04-081-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | [automerger skipped] [Patch] Modify the priority for Standalone CBRS case. am...danielwbhuang2020-04-070-0/+0
| |\ \ \ \
| * \ \ \ \ Modify the priority for Standalone CBRS case. am: 76d79eb3b5 am: f891c31babdanielwbhuang2020-04-064-5/+193
| |\ \ \ \ \
| * \ \ \ \ \ DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am:...Xin Li2020-03-200-0/+0
| |\ \ \ \ \ \
| | | | | | * \ Merge "Fix wrong service name" am: 4bb98285c9 am: 349f80d82cTreehugger Robot2020-04-081-1/+1
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge "Fix wrong service name" am: 4bb98285c9Treehugger Robot2020-04-081-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Fix wrong service name"Treehugger Robot2020-04-081-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix wrong service nameTaesu Lee2019-11-291-1/+1
| | | | | | * | [automerger skipped] [Patch] Modify the priority for Standalone CBRS case. am...danielwbhuang2020-04-070-0/+0
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | [automerger skipped] [Patch] Modify the priority for Standalone CBRS case. am...danielwbhuang2020-04-070-0/+0
|\| | | | | | | | |_|_|_|/ / / |/| | | | | |
| * | | | | | [Patch] Modify the priority for Standalone CBRS case.danielwbhuang2020-04-071-3/+8
| | | | | * | [automerger skipped] Modify the priority for Standalone CBRS case. am: 76d79e...danielwbhuang2020-04-060-0/+0
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Modify the priority for Standalone CBRS case. am: 76d79eb3b5danielwbhuang2020-04-064-5/+193
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | Modify the priority for Standalone CBRS case.danielwbhuang2020-04-064-5/+193
| | | | * | [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ...Xin Li2020-03-200-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-masterXin Li2020-03-191-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 27bb99ed09 am: 662c...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| | | | * | [automerger skipped] Rename featureId -> attributionTag am: 510c5d7824 -s oursAutomerger Merge Worker2020-03-130-0/+0
| | | | |\|
| | | | | * Rename featureId -> attributionTagPhilip P. Moltmann2020-03-111-1/+1
| | | | * | Rename featureId -> attributionTagPhilip P. Moltmann2020-03-111-1/+1
| | | | * | [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | / | | | | |/
* | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 27bb99ed09Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-053-33/+27
| |\ \ \ \ | |/ / / / |/| | | |
| | | | * Do not create multiple ONS for different users am: ef15e504ed am: eb9394c502Automerger Merge Worker2020-02-111-1/+2
| | | | |\ | | | |_|/ | | |/| |
| | * | | Do not create multiple ONS for different users am: ef15e504edAutomerger Merge Worker2020-02-111-1/+2
| | |\ \ \
| | | * | | Do not create multiple ONS for different usersSooraj Sasindran2020-02-101-1/+2
| | | | | * Merge "Revert "Split ONS into a client apk and a lib.""Amit Mahajan2020-02-0410-111/+31
| | | | | |\
| | | | | | * Revert "Split ONS into a client apk and a lib."Amit Mahajan2020-02-0310-111/+31
| | | | | * | Fix import of Rlog - generated by formatting tool am: 3aa74a7a16 am: daeba8c5...Automerger Merge Worker2020-01-314-6/+4
| | | | | |\ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fix import of Rlog - generated by formatting tool am: 3aa74a7a16 am: daeba8c583Automerger Merge Worker2020-01-314-8/+6
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Fix import of Rlog - generated by formatting tool am: 3aa74a7a16android10-sidebranchAutomerger Merge Worker2020-01-314-8/+6
|\| | | | | |
| * | | | | | Fix import of Rlog - generated by formatting toolandroid-r-preview-1Meng Wang2020-01-304-8/+6
| | | | | * | [automerger skipped] Merge "Use com.android.telephony.Rlog for mainline modul...Automerger Merge Worker2020-01-300-0/+0
| | | | | |\ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Use com.android.telephony.Rlog for mainline module." am: 20806793ce am...Automerger Merge Worker2020-01-304-4/+4
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | |
* | | | | | | Merge "Use com.android.telephony.Rlog for mainline module." am: 20806793ceAutomerger Merge Worker2020-01-304-4/+4
|\| | | | | |
| * | | | | | Merge "Use com.android.telephony.Rlog for mainline module."Treehugger Robot2020-01-304-4/+4
| |\ \ \ \ \ \
| | * | | | | | Use com.android.telephony.Rlog for mainline module.Meng Wang2020-01-134-4/+4
| | | | | | * | Remove unused import.Amit Mahajan2020-01-281-2/+1
| | | | | | |/
| | | | | | * [automerger skipped] Switch data to default subscription am: 3ea160cf37 -s ou...Automerger Merge Worker2020-01-280-0/+0
| | | | | | |\ | | | | |_|_|/ | | | |/| | |
| | | * | | | [automerger skipped] Switch data to default subscription am: 3ea160cf37 -s ou...Automerger Merge Worker2020-01-280-0/+0
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
* | | | | | | [automerger skipped] Switch data to default subscriptionSooraj Sasindran2020-01-270-0/+0
|\| | | | | |