Merge lp://staging/~morphis/ubuntu-touch-session/sync-vivid-and-droid-discover into lp://staging/ubuntu-touch-session
Proposed by
Simon Fels
| Status: | Merged |
|---|---|
| Merged at revision: | 277 |
| Proposed branch: | lp://staging/~morphis/ubuntu-touch-session/sync-vivid-and-droid-discover |
| Merge into: | lp://staging/ubuntu-touch-session |
| Diff against target: |
133 lines (+70/-5) 7 files modified
touch.pa (+4/-4) ubuntu-touch-session.d/flo.conf (+1/-0) ubuntu-touch-session.d/mako.conf (+1/-0) upstart-session/bluez-mpris-proxy.conf (+9/-0) upstart-session/cameraservice-trust-stored.conf (+33/-0) upstart-session/obexd.conf (+1/-1) upstart-session/pulseaudio-trust-stored.conf (+21/-0) |
| To merge this branch: | bzr merge lp://staging/~morphis/ubuntu-touch-session/sync-vivid-and-droid-discover |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Phablet Team | Pending | ||
|
Review via email:
|
|||
Commit message
Sync with changes from vivid overlay ppa and enable PulseAudio Droid discover module.
Description of the change
Sync with changes from vivid overlay ppa and enable PulseAudio Droid discover module.
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
