OSDN Git Service

(root) / android-x86 / packages-apps-Gallery2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4001b59 64d592c)
resolved conflicts for merge of 64d592c0 to master
authorOwen Lin <owenlin@google.com>
Fri, 11 Nov 2011 10:17:26 +0000 (18:17 +0800)
committerOwen Lin <owenlin@google.com>
Fri, 11 Nov 2011 10:17:26 +0000 (18:17 +0800)
commitfa0af6939e716e8ad07ca9200fbe665d165aefda
treec80b7bd1e87d9e83dd591b2116a4b292e0db411etree | snapshot
parent4001b59bc073c674bffa10b32d9c53654888ce37commit | diff
parent64d592c0573766162498bf16933bd8699b8fa77fcommit | diff
resolved conflicts for merge of 64d592c0 to master

Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059
gallerycommon/src/com/android/gallery3d/common/FileCache.java diff1 | diff2 | blob | history
packages/apps/Gallery2
About OSDN
Find Software
Develop Software
Help