Merge lp:~popey/ubuntu-filemanager-app/fix-1336764 into lp:ubuntu-filemanager-app

[Alan Pope 🍺🐧🐱 🦄]

bump framework

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:217
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/272/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/754
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/754/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/70

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/272/rebuild

review: Approve (continuous-integration)

=== modified file 'apparmor.json'
--- apparmor.json	2014-04-24 08:58:40 +0000
+++ apparmor.json	2014-07-02 12:29:02 +0000
@@ -1,5 +1,5 @@
 {
-    "policy_version": 1.1,
+    "policy_version": 1.2,
     "template": "unconfined",
     "policy_groups": []
-}
\ No newline at end of file
+}

=== modified file 'manifest.json'
--- manifest.json	2014-04-26 06:35:52 +0000
+++ manifest.json	2014-07-02 12:29:02 +0000
@@ -1,6 +1,6 @@
 {
     "description": "File Manager application",
-    "framework": "ubuntu-sdk-14.04-dev1",
+    "framework": "ubuntu-sdk-14.04-dev2",
     "architecture": "armhf",
     "hooks": {
         "filemanager": {
@@ -21,4 +21,4 @@
     "x-test": {
         "autopilot": "filemanager"
     }
-}
\ No newline at end of file
+}