diff options
author | Jon Miranda <jonmiranda@google.com> | 2018-02-08 18:54:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-02-08 18:54:26 +0000 |
commit | 8fa2d463d1fd789ef8de4fa3a16e7a60e27dd7b7 (patch) | |
tree | fea66d74c8b32d168fc354d281a68937c582a928 /sample/assets | |
parent | eb2ff754284dce6eece14bdbc02d0d02928cf4b9 (diff) | |
parent | a067d8ec0a84d54b550ece85f19e185e0bb456ec (diff) | |
download | subsampling-scale-image-view-8fa2d463d1fd789ef8de4fa3a16e7a60e27dd7b7.tar.gz |
Merge branch 'upstream-master'
am: a067d8ec0a
Change-Id: I0acdc3fd70de45073b26e9fb60fde5edb7544813
Diffstat (limited to 'sample/assets')
-rw-r--r-- | sample/assets/card.png | bin | 0 -> 2557572 bytes |
-rw-r--r-- | sample/assets/sanmartino.jpg | bin | 0 -> 2955239 bytes |
-rw-r--r-- | sample/assets/swissroad.jpg | bin | 0 -> 2517949 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/sample/assets/card.png b/sample/assets/card.png Binary files differnew file mode 100644 index 0000000..20f330b --- /dev/null +++ b/sample/assets/card.png diff --git a/sample/assets/sanmartino.jpg b/sample/assets/sanmartino.jpg Binary files differnew file mode 100644 index 0000000..faf7a51 --- /dev/null +++ b/sample/assets/sanmartino.jpg diff --git a/sample/assets/swissroad.jpg b/sample/assets/swissroad.jpg Binary files differnew file mode 100644 index 0000000..3a32151 --- /dev/null +++ b/sample/assets/swissroad.jpg |