Merge lp://staging/~karni/ubuntuone-android-files/add-quick-icons into lp://staging/ubuntuone-android-files
Proposed by
Michał Karnicki
| Status: | Merged |
|---|---|
| Merged at revision: | 108 |
| Proposed branch: | lp://staging/~karni/ubuntuone-android-files/add-quick-icons |
| Merge into: | lp://staging/ubuntuone-android-files |
| Diff against target: |
560 lines (+140/-142) (has conflicts) 6 files modified
.project (+4/-0) src/com/ubuntuone/android/files/provider/MetaUtilities.java (+32/-73) src/com/ubuntuone/android/files/service/UpDownService.java (+14/-9) src/com/ubuntuone/android/files/service/UpDownServiceHelper.java (+78/-48) src/com/ubuntuone/android/files/ui/FilesActivity.java (+11/-11) src/com/ubuntuone/android/files/ui/PreferencesActivity.java (+1/-1) Text conflict in .project |
| To merge this branch: | bzr merge lp://staging/~karni/ubuntuone-android-files/add-quick-icons |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chad Miller | Pending | ||
|
Review via email:
|
|||
Description of the change
Add quick icons from Andrew.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
