(cherry picked from commit 3aafc671f83d0c8bdc44afc3d69e9bb0d91adb7c) # Conflicts: # app/build.gradle |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 3aafc671f83d0c8bdc44afc3d69e9bb0d91adb7c) # Conflicts: # app/build.gradle |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||