OSDN Git Service
(root)
/
android-x86
/
packages-apps-Gallery2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3564326
0c71308
)
am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce
author
John Hoford
<hoford@google.com>
Wed, 24 Apr 2013 01:18:48 +0000
(18:18 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 24 Apr 2013 01:18:48 +0000
(18:18 -0700)
* commit '
0c71308c9d2a72d4a3faf00242707de773d5beba
':
interruptible renderer
1
2
src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/gallery3d/filtershow/presets/ImagePreset.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/gallery3d/filtershow/cache/CachingPipeline.java
Simple merge
diff --cc
src/com/android/gallery3d/filtershow/presets/ImagePreset.java
Simple merge