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.

Sign up for GitHub

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

Jump to bottom

Cherry pick PR #3151: Add Android asset manager. #3189

Merged
merged 5 commits into from
May 31, 2024
Merged

Cherry pick PR #3151: Add Android asset manager. #3189

merged 5 commits into from
May 31, 2024

Commits on May 7, 2024

  1. Add Android asset manager. (#3151) 

    b/302715109

Change-Id: I3f22470821c1c77695d7c740c66ae227944e87c5
(cherry picked from commit 6e756ad)
    @yjzhang111 @anonymous1-me
    yjzhang111 authored and anonymous1-me committed May 7, 2024
    Configuration menu
    Copy the full SHA
    2cf8012 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. Resolve conflict in BUILD.gn 

    Change-Id: I77019537e676011509054224c9c4c1df14c28b0e
    @yjzhang111
    yjzhang111 committed May 8, 2024
    Configuration menu
    Copy the full SHA
    3f068b7 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Resolve conflict in BUILD.gn 

    Change-Id: I77019537e676011509054224c9c4c1df14c28b0e
    @yjzhang111
    yjzhang111 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    63f05e7 View commit details
    Browse the repository at this point in the history

  2. Merge branch '25.lts.1+' into cherry-pick-25.lts.1+-3151

    @yjzhang111
    yjzhang111 authored May 9, 2024
    Configuration menu
    Copy the full SHA
    ad43a28 View commit details
    Browse the repository at this point in the history

  3. Remove files in test_filter.py 

    Change-Id: Iff819115d380d5e958ad41b3111b29e4c26ba0f7
    @yjzhang111
    yjzhang111 committed May 9, 2024
    Configuration menu
    Copy the full SHA
    bbfa1a8 View commit details
    Browse the repository at this point in the history