[Merge] lp:~chris.gagnon/friends-app/autopilot-1.4 into lp:friends-app

[PS Jenkins bot]

Review: Needs Fixing continuous-integration

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/friends-app-autolanding/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-app-trusty-amd64-autolanding/3
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/470
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/445
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/482
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/482/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/470
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/470/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3122/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1092

-- 
https://code.launchpad.net/~chris.gagnon/friends-app/autopilot-1.4/+merge/193293
Your team Super Friends is subscribed to branch lp:friends-app.