diff options
| author | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2013-02-15 10:49:18 -0800 |
| commit | 1a76449a643ab1e544da54514cf09f6f17f4d075 (patch) | |
| tree | 2615a977c52d7a479001ed451a58aa484dbe75e0 /chips/res | |
| parent | 9f1ab148925b098cec90d06992ade0fca2889a14 (diff) | |
| parent | e032f315b6f95896ff471e92a20a42159d53fa6a (diff) | |
| download | android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.gz android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.tar.bz2 android_frameworks_ex-1a76449a643ab1e544da54514cf09f6f17f4d075.zip | |
Merge branch 'goog/jb-ub-mail-ur8' into master
Conflicts:
photoviewer/AndroidManifest.xml
photoviewer/res/values/dimen.xml
photoviewer/src/com/android/ex/photo/Intents.java
photoviewer/src/com/android/ex/photo/PhotoViewActivity.java
photoviewer/src/com/android/ex/photo/adapters/BaseCursorPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/BaseFragmentPagerAdapter.java
photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
photoviewer/src/com/android/ex/photo/fragments/PhotoViewFragment.java
photoviewer/src/com/android/ex/photo/provider/PhotoContract.java
photoviewer/src/com/android/ex/photo/util/ImageUtils.java
photoviewer/src/com/android/ex/photo/views/PhotoView.java
Change-Id: Icb06b228f0eab1f828a21507ec2fbe7ede998536
Diffstat (limited to 'chips/res')
| -rw-r--r-- | chips/res/drawable-hdpi/ic_contact_picture.png | bin | 5929 -> 944 bytes |
| -rw-r--r-- | chips/res/drawable-mdpi/ic_contact_picture.png | bin | 4733 -> 686 bytes |
| -rw-r--r-- | chips/res/drawable-xhdpi/ic_contact_picture.png | bin | 7422 -> 1299 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/chips/res/drawable-hdpi/ic_contact_picture.png b/chips/res/drawable-hdpi/ic_contact_picture.png Binary files differindex 2eef7b5..4c0e35e 100644 --- a/chips/res/drawable-hdpi/ic_contact_picture.png +++ b/chips/res/drawable-hdpi/ic_contact_picture.png diff --git a/chips/res/drawable-mdpi/ic_contact_picture.png b/chips/res/drawable-mdpi/ic_contact_picture.png Binary files differindex 6c7cb61..ead9718 100644 --- a/chips/res/drawable-mdpi/ic_contact_picture.png +++ b/chips/res/drawable-mdpi/ic_contact_picture.png diff --git a/chips/res/drawable-xhdpi/ic_contact_picture.png b/chips/res/drawable-xhdpi/ic_contact_picture.png Binary files differindex 1a2bfde..05a65f6 100644 --- a/chips/res/drawable-xhdpi/ic_contact_picture.png +++ b/chips/res/drawable-xhdpi/ic_contact_picture.png |
