(cherry picked from commit c041410f615a6af7466c934dd2c30a16a5f5464e) # Conflicts: # app/src/main/res/layout/extension_detail_controller.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit c041410f615a6af7466c934dd2c30a16a5f5464e) # Conflicts: # app/src/main/res/layout/extension_detail_controller.xml |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||