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 | ace62b69bd53518faea7be986f6c7481b271ca3f (patch) | |
tree | 174afc2cc483ec2575bccd32e413c927fc5e9b79 /src/com/android/camera/IconListPreference.java | |
parent | d87305a547d614d47af48886d7e1c616ad20336e (diff) | |
parent | a3dc2c0dd75f4659146fcd257ce32acc3800ae5f (diff) | |
download | android_packages_apps_Gallery2-ace62b69bd53518faea7be986f6c7481b271ca3f.tar.gz android_packages_apps_Gallery2-ace62b69bd53518faea7be986f6c7481b271ca3f.tar.bz2 android_packages_apps_Gallery2-ace62b69bd53518faea7be986f6c7481b271ca3f.zip |
Merge "Remove com.android.camera.R" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/camera/IconListPreference.java')
-rw-r--r-- | src/com/android/camera/IconListPreference.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/IconListPreference.java b/src/com/android/camera/IconListPreference.java index 6bcd59df1..e5f75d3a5 100644 --- a/src/com/android/camera/IconListPreference.java +++ b/src/com/android/camera/IconListPreference.java @@ -21,6 +21,8 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.util.AttributeSet; +import com.android.gallery3d.R; + import java.util.List; /** A {@code ListPreference} where each entry has a corresponding icon. */ |