Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Annotated result of StubPlayer.getPlayerError with @Nullable #96

Merged
merged 1 commit into from
Jul 4, 2022

Conversation

fengdai
Copy link

@fengdai fengdai commented Jun 28, 2022

No description provided.

@marcbaechinger marcbaechinger self-assigned this Jul 1, 2022
@marcbaechinger marcbaechinger self-requested a review July 1, 2022 13:40
@marcbaechinger
Copy link
Contributor

Thanks for the fix!

When doing a pull request, you need to request from and against the main branch. A pull request results in a commit on the main branch and will then be merged into the release branch with the next release process.

For the case of this CL you can chose to send it again compared and requested against the main branch. I can apply this change internally, as it is easy to do. It won't be credited/attributed to your GitHub account in the latter case. So please let me know what you prefer. Thanks again for using Media3!

@fengdai fengdai changed the base branch from release to main July 2, 2022 01:32
@fengdai
Copy link
Author

fengdai commented Jul 2, 2022

I've changed the target branch to main.

@marcbaechinger marcbaechinger merged commit 8e5af4a into androidx:main Jul 4, 2022
rohitjoins pushed a commit that referenced this pull request Jul 15, 2022
PiperOrigin-RevId: 458883441
(cherry picked from commit 8e5af4a)
marcbaechinger pushed a commit that referenced this pull request Sep 30, 2022
PiperOrigin-RevId: 458883441
(cherry picked from commit 486c350)
marcbaechinger pushed a commit that referenced this pull request Sep 30, 2022
PiperOrigin-RevId: 458883441
@androidx androidx locked and limited conversation to collaborators Mar 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants