summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2015-04-15 01:28:23 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2015-04-15 01:28:23 -0700
commitc3e3dbad5dda8b83d32cd659855f1ea0d3a7ca2c (patch)
tree3643734b23e1997ae1a53e0afb3c92a0f19d10b4 /res
parent1f63762416c703a2ad8b1082c20b2f399e1f38f6 (diff)
parent547d65c77296b4f2d164fdcf86a970a761b5bc89 (diff)
downloadandroid_packages_apps_Snap-c3e3dbad5dda8b83d32cd659855f1ea0d3a7ca2c.tar.gz
android_packages_apps_Snap-c3e3dbad5dda8b83d32cd659855f1ea0d3a7ca2c.tar.bz2
android_packages_apps_Snap-c3e3dbad5dda8b83d32cd659855f1ea0d3a7ca2c.zip
Merge "SnapdragonCamera: fix crash with persist.panel.orientation"
Diffstat (limited to 'res')
-rw-r--r--res/layout/camera_controls.xml (renamed from res/layout-port/camera_controls.xml)0
-rw-r--r--res/layout/pano_review_control.xml (renamed from res/layout-port/pano_review_control.xml)0
2 files changed, 0 insertions, 0 deletions
diff --git a/res/layout-port/camera_controls.xml b/res/layout/camera_controls.xml
index af47a13b6..af47a13b6 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout/camera_controls.xml
diff --git a/res/layout-port/pano_review_control.xml b/res/layout/pano_review_control.xml
index eeb2ebee4..eeb2ebee4 100644
--- a/res/layout-port/pano_review_control.xml
+++ b/res/layout/pano_review_control.xml