OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e75d340
c1f3d4c
)
am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript"
author
Glenn Kasten
<gkasten@android.com>
Wed, 19 Mar 2014 21:05:20 +0000
(14:05 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 19 Mar 2014 21:05:20 +0000
(14:05 -0700)
* commit '
c1f3d4c1ba7903d1b72c2341b5284da12b79ee46
':
Fix 64 bit compile failures in renderscript
1
2
rs/jni/android_renderscript_RenderScript.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
rs/jni/android_renderscript_RenderScript.cpp
Simple merge