diff options
author | John Reck <jreck@google.com> | 2013-02-16 00:01:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-16 00:01:06 +0000 |
commit | ad16c6799d559d304bb8688e37a02d2d9bc53a42 (patch) | |
tree | 41eaca93b6cdc1f1269fef682f3820a15ffed2e5 /src/com/android/camera/ui/TimeIntervalPopup.java | |
parent | 04026a407aca122132ce746a675ac20782f3ab08 (diff) | |
parent | 54987e8d3af88214ce4f3aed0b5c4e9ded5b1392 (diff) | |
download | android_packages_apps_Snap-ad16c6799d559d304bb8688e37a02d2d9bc53a42.tar.gz android_packages_apps_Snap-ad16c6799d559d304bb8688e37a02d2d9bc53a42.tar.bz2 android_packages_apps_Snap-ad16c6799d559d304bb8688e37a02d2d9bc53a42.zip |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera/ui/TimeIntervalPopup.java')
-rw-r--r-- | src/com/android/camera/ui/TimeIntervalPopup.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/ui/TimeIntervalPopup.java b/src/com/android/camera/ui/TimeIntervalPopup.java index b79663be2..18ad9f5da 100644 --- a/src/com/android/camera/ui/TimeIntervalPopup.java +++ b/src/com/android/camera/ui/TimeIntervalPopup.java @@ -28,7 +28,7 @@ import android.widget.TextView; import com.android.camera.IconListPreference; import com.android.camera.ListPreference; -import com.android.camera.R; +import com.android.gallery3d.R; /** * This is a popup window that allows users to turn on/off time lapse feature, |