Skip to content

Commit

Permalink
Merge branch 'main' of github.com:google/generative-ai-android into r…
Browse files Browse the repository at this point in the history
…pf-java-get-chat-history

# Conflicts:
#	README.md
#	generativeai-android-sample/screenshots/screenshots.png
  • Loading branch information
thatfiredev committed Dec 13, 2023
2 parents e0d2499 + 11b3de2 commit 2b8eced
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ print(response.text)

This repository contains a sample app demonstrating how the SDK can access and utilize the Gemini model for various use cases.

To try out the sample app, follow these steps:
To try out the sample app you can directly import the project from Android Studio
via **File > New > Import Sample** and searching for *Generative AI Sample* or follow these steps below:

1. Check out this repository.\
`git clone https://github.com/google/generative-ai-android`
Expand Down
2 changes: 1 addition & 1 deletion generativeai-android-sample/.google/packaging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ technologies: [Android, AI, JetpackCompose]
categories:
- Artificial Intelligence
- Machine Learning
- JetpackComposeLayouts
- Jetpack Compose Layouts
languages: [Kotlin]
solutions:
- Mobile
Expand Down
Binary file modified generativeai-android-sample/screenshots/screenshots.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2b8eced

Please sign in to comment.