summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Automatic translation importlineage-16.0Michael W2020-03-2813-11/+38
* Automatic translation importMichael W2020-03-221-2/+1
* Merge tag 'android-9.0.0_r50' into staging/lineage-16.0_merge-android-9.0.0_r50Kevin F. Haggerty2019-11-111-0/+12
|\
| * DO NOT MERGE: AdapterService: Check the PIN code length before usingCheney Ni2019-09-181-0/+12
| * DO NOT MERGE Separate SDP procedure from bonding state (2/2)Ugo Yu2019-09-1813-69/+536
| * Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"Arjun Garg2019-07-1513-536/+69
| * DO NOT MERGE Separate SDP procedure from bonding state (2/2)Ugo Yu2019-06-1013-69/+536
| * Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"JP Sugarbroad2019-03-1913-536/+70
| * DO NOT MERGE Separate SDP procedure from bonding state (2/2)Ugo Yu2019-02-1213-70/+536
* | Merge tag 'android-9.0.0_r46' into staging/lineage-16.0_merge-android-9.0.0_r46Kevin F. Haggerty2019-08-0513-69/+536
|\ \
| * \ Merge cherrypicks of [7982564, 7982192, 7982565, 7981411, 7982522, 7982682, 7...android-build-team Robot2019-06-1113-69/+536
| |\ \
| | * | DO NOT MERGE Separate SDP procedure from bonding state (2/2)Ugo Yu2019-06-1113-69/+536
| |/ /
* | | Fix null pointer exception on AvrcpTargetServiceslki.shin2019-07-251-0/+4
* | | Merge remote-tracking branch 'aosp/pie-gsi' into lineage-16.0-pie-gsiLuca Stefani2019-07-136-13/+13
|\ \ \
| * \ \ Merge "Snap for 5622519 from b41383de4cf71e1d12e5a911e0d58d9ab7b0679e to pi-p...Android Merger2019-07-096-13/+13
| |\ \ \
| | * | | Snap for 5622519 from b41383de4cf71e1d12e5a911e0d58d9ab7b0679e to pi-platform...android-build-team Robot2019-07-096-13/+13
| |/| | |
| | * | | Snap for 5622519 from b41383de4cf71e1d12e5a911e0d58d9ab7b0679e to pi-platform...android-build-team Robot2019-07-086-13/+13
| | |\ \ \
| | | * \ \ Merge cherrypicks of [7478367, 7478616] into pi-qpr3-b-releaseandroid-build-team Robot2019-05-1313-536/+70
| | | |\ \ \
| | | | * | | Revert "DO NOT MERGE Separate SDP procedure from bonding state (2/2)"Myles Watson2019-05-1313-536/+70
| | | |/ / /
| | | * | | Merge cherrypicks of [7316389, 7315812, 7315813, 7316457, 7316055, 7315736, 7...android-build-team Robot2019-05-031-2/+2
| | | |\ \ \
| | | | * | | DO NOT MERGE Revert "BondStateMachine: Check for null before calling getDevic...Myles Watson2019-05-031-2/+2
| | | |/ / /
| | | * | | Snap for 5526913 from bc628e96249b2cfc38015b97d7d8e12afc37da1d to pi-qpr3-b-r...android-build-team Robot2019-05-030-0/+0
| | | |\ \ \
| | | | * \ \ [automerger skipped] [automerger] Revert "DO NOT MERGE: BondStateMachine: Che...Myles Watson2019-05-010-0/+0
| | | | |\ \ \
| | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Myles Watson2019-05-010-0/+0
| | | | | |\ \ \
| | | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Myles Watson2019-05-010-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Android Build Merger (Role)2019-05-010-0/+0
| | | | | | | |\ \ \
| | | | | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Android Build Merger (Role)2019-05-011-2/+2
| | | | | | | | |\ \ \
| | | | | | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Android Build Merger (Role)2019-05-011-2/+2
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Android Build Merger (Role)2019-05-011-2/+2
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ [automerger] Revert "DO NOT MERGE: BondStateMachine: Check for null before ca...Android Build Merger (Role)2019-05-011-2/+2
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * | | Revert "DO NOT MERGE: BondStateMachine: Check for null before calling getDevi...Myles Watson2019-05-011-2/+2
| | | | * | | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null be...Myles Watson2019-04-110-0/+0
| | | | |\| | | | | | | | | |
| | | | | * | | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null be...Myles Watson2019-04-110-0/+0
| | | | | |\| | | | | | | | |
| | | | | | * | | | | | | | | [automerger skipped] Merge "DO NOT MERGE: BondStateMachine: Check for null be...Myles Watson2019-04-110-0/+0
| | | | | | |\| | | | | | | |
| | | | | | | * | | | | | | | Merge "DO NOT MERGE: BondStateMachine: Check for null before calling getDevic...TreeHugger Robot2019-04-111-3/+3
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceTypeMyles Watson2019-04-111-3/+3
| | | | * | | | | | | | | | | | Merge "BondStateMachine: Check for null before calling getDeviceType" into oc...Myles Watson2019-04-111-2/+2
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge "BondStateMachine: Check for null before calling getDeviceType" into oc...TreeHugger Robot2019-04-111-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | BondStateMachine: Check for null before calling getDeviceTypeMyles Watson2019-04-101-2/+2
| | | | * | | | | | | | | | | | | [automerger skipped] [automerger] DO NOT MERGE: BondStateMachine: Check for n...Myles Watson2019-04-110-0/+0
| | | | |\| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Myles Watson2019-04-100-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / | | | | | |/| / / / / / / / / / / | | | | | | |/ / / / / / / / / /
| | | | | | * | | | | | | | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Myles Watson2019-04-100-0/+0
| | | | | | |\| | | | | | | | |
| | | | | | | * | | | | | | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Android Build Merger (Role)2019-04-100-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | |/| / / / / / / / | | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Android Build Merger (Role)2019-04-101-2/+2
| | | | | | | | |\| | | | | |
| | | | | | | | | * | | | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Android Build Merger (Role)2019-04-101-2/+2
| | | | | | | | | |\| | | | |
| | | | | | | | | | * | | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Android Build Merger (Role)2019-04-101-2/+2
| | | | | | | | | | |\| | | |
| | | | | | | | | | | * | | | [automerger] DO NOT MERGE: BondStateMachine: Check for null before calling ge...Android Build Merger (Role)2019-04-101-2/+2
| | | | | | | | | | | |\| | |
| | | | | | | | | | | | * | | DO NOT MERGE: BondStateMachine: Check for null before calling getDeviceTypeMyles Watson2019-04-101-2/+2
| | | * | | | | | | | | | | | Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, 7...android-build-team Robot2019-04-161-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | BondStateMachine: Check for null before calling getDeviceTypeMyles Watson2019-04-161-2/+2
| | | |/ / / / / / / / / / / /