diff options
| author | Doris Liu <tianliu@google.com> | 2013-06-21 21:11:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-21 21:11:50 +0000 |
| commit | 4956b8e60bfb860f76f22d449ee0d0c0d0cbaf4a (patch) | |
| tree | 7274be33ea1deee73074a5dcacd8553c58d17121 /res/layout | |
| parent | d759db61f0c5a7b2a0777acc51dcb512a6e4c46a (diff) | |
| parent | ff529508bb5ebd6bede02c29a251dee3ed5eb7b7 (diff) | |
| download | android_packages_apps_Snap-4956b8e60bfb860f76f22d449ee0d0c0d0cbaf4a.tar.gz android_packages_apps_Snap-4956b8e60bfb860f76f22d449ee0d0c0d0cbaf4a.tar.bz2 android_packages_apps_Snap-4956b8e60bfb860f76f22d449ee0d0c0d0cbaf4a.zip | |
Merge "Remove SRI panorama" into gb-ub-photos-carlsbad
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/panorama_module.xml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/res/layout/panorama_module.xml b/res/layout/panorama_module.xml deleted file mode 100644 index 9ecbd07f7..000000000 --- a/res/layout/panorama_module.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<merge xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pano_layout" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <include layout="@layout/pano_module_capture" /> - <include layout="@layout/pano_review" /> -</merge> |