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

[Android] Fix handling manual code in CHIPTool #29255

Merged
merged 5 commits into from
Sep 22, 2023
Merged

[Android] Fix handling manual code in CHIPTool #29255

merged 5 commits into from
Sep 22, 2023

Commits on Sep 14, 2023

  1. [Android] Fix handling manual code in CHIPTool

    @pachuho
    pachuho committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    86b66ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/fix_manual_code

    @pachuho
    pachuho authored Sep 14, 2023
    Configuration menu
    Copy the full SHA
    4ee1e6a View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. [Android] Fix handling manual code in CHIPTool

    @pachuho
    pachuho committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    039dcd0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/fix_manual_code' into fe… 

    …ature/fix_manual_code

# Conflicts:
#	examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/BarcodeFragment.kt
    @pachuho
    pachuho committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    c87a231 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Re-run kotlin formatter via scriptsd/helpers/kotlin-format.sh

    @andreilitvin
    andreilitvin committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    c7c2ed2 View commit details
    Browse the repository at this point in the history