diff options
author | Wu-cheng Li <wuchengli@google.com> | 2010-11-09 11:04:56 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2010-11-09 11:04:56 +0800 |
commit | 6897561d02003e59c038f1dc4d4669e3723e9cad (patch) | |
tree | 024bc4535afaa92d096c2bcf6f88bb657314ba30 /res/drawable-mdpi/ic_viewfinder_camera_facing_back.png | |
parent | f59f7fb9870c1f285f9bdb5e3ca47a1548527837 (diff) | |
parent | 86b149d93eaf2dc9004653de40a178891022260f (diff) | |
download | LegacyCamera-6897561d02003e59c038f1dc4d4669e3723e9cad.zip LegacyCamera-6897561d02003e59c038f1dc4d4669e3723e9cad.tar.gz LegacyCamera-6897561d02003e59c038f1dc4d4669e3723e9cad.tar.bz2 |
resolved conflicts for merge of 86b149d9 to master
Change-Id: Ida51ce14cbee3071cc26448e39bec05d505c8947
Diffstat (limited to 'res/drawable-mdpi/ic_viewfinder_camera_facing_back.png')
0 files changed, 0 insertions, 0 deletions