Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
dec3d69
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
0e0333b
Merge remote-tracking branch 'upstream/main'
camsim99 May 2, 2023
bd7ac99
Merge remote-tracking branch 'upstream/main'
camsim99 May 3, 2023
5c3363b
Merge remote-tracking branch 'upstream/main'
camsim99 May 10, 2023
fed9621
Undo changes
camsim99 May 10, 2023
5aabe34
Merge remote-tracking branch 'upstream/main'
camsim99 May 12, 2023
2b9a352
Merge remote-tracking branch 'upstream/main'
camsim99 May 25, 2023
a1173da
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cbc3d6b
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cae5a4c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 1, 2023
72283db
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
166a77c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
399780e
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 14, 2023
8d5d0e7
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 26, 2023
084d960
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 12, 2023
d2a59ac
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
a1422bf
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
bdd87a6
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 18, 2023
137a28b
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 19, 2023
bc0db5a
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 20, 2023
d04b466
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 21, 2023
a9cfe87
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 24, 2023
a32def1
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 2, 2023
4785148
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 14, 2023
7a8fc69
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 15, 2023
b02e15f
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 15, 2023
c6e5868
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 17, 2023
0c0065a
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 28, 2023
9dfe259
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 29, 2023
bfcc0df
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 30, 2023
7ee21ea
Bump tests to 34
camsim99 Aug 30, 2023
cc2957d
Bump linux android
camsim99 Aug 31, 2023
0026d0e
Try filtering packages
camsim99 Sep 13, 2023
0bc3706
Merge remote-tracking branch 'upstream/main' into test_34_1
camsim99 Sep 13, 2023
791dd78
Add filter script
camsim99 Sep 13, 2023
c687491
Add quick actions test fix
camsim99 Sep 13, 2023
d91007d
Add 6 back in
camsim99 Sep 13, 2023
4c628c7
Remove quick actions fix attempt, partially address review
camsim99 Sep 14, 2023
83afe66
Correct exclusions/inclusions
camsim99 Sep 14, 2023
89a968a
Remove exlude filter
camsim99 Sep 14, 2023
4430919
Path provider fails with 33, so put back to 34
camsim99 Sep 14, 2023
f39b0b0
Exclude webview
camsim99 Sep 18, 2023
cd977fe
Merge remote-tracking branch 'upstream/main' into test_34_1
camsim99 Sep 18, 2023
70c7aeb
Merge branch 'main' into test_34_1
camsim99 Sep 18, 2023
57117d8
Update still_requires_api_33_avd_drive_examples.yaml
camsim99 Sep 19, 2023
844c8cb
Add new tasks, reduce config files to one
camsim99 Sep 20, 2023
3861779
Merge branch 'test_34_1' of github.com:camsim99/packages into test_34_1
camsim99 Sep 20, 2023
a42b3e6
Fix comments
camsim99 Sep 20, 2023
ea10dde
Mark bringup true
camsim99 Sep 20, 2023
f4b839e
Merge remote-tracking branch 'upstream/main' into test_34_1
camsim99 Sep 26, 2023
685f810
Get rid of duplicate tasks
camsim99 Sep 26, 2023
5272d12
Update exclusions, delte unused files
camsim99 Sep 27, 2023
a764265
Fix integration test, try removing line that may be failing due to pe…
camsim99 Sep 28, 2023
c8883bc
Try using permissions, alternatively
camsim99 Sep 28, 2023
3cfd2b3
Remove experimental changes
camsim99 Oct 9, 2023
106db42
Merge remote-tracking branch 'upstream/main' into test_34_1
camsim99 Oct 9, 2023
7dab380
Undo my changes
camsim99 Oct 9, 2023
378c808
Add audio permission for music
camsim99 Oct 9, 2023
e3229a8
Add permissions and bump version
camsim99 Oct 9, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main'
  • Loading branch information
camsim99 committed May 30, 2023
commit a1173da57d7ef8f1d22b1f1f0de956d272f79cf5

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.