diff options
| author | Stephen Hines <srhines@google.com> | 2014-11-05 15:57:52 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-11-05 15:57:52 -0800 |
| commit | 22db36b37e3835f9a02a4d2d1ae7c57f7ea31ada (patch) | |
| tree | 50ab340ad1edbbb2037245dc48eaa51ec2713700 /renderscript | |
| parent | 019eb4dab9402a0c4c6bc08e15632fd4cceb74d2 (diff) | |
| parent | d6c7dc4cbd5ccb77ca3b0b05ff6287e3b2932607 (diff) | |
| download | prebuilts_sdk-22db36b37e3835f9a02a4d2d1ae7c57f7ea31ada.zip prebuilts_sdk-22db36b37e3835f9a02a4d2d1ae7c57f7ea31ada.tar.gz prebuilts_sdk-22db36b37e3835f9a02a4d2d1ae7c57f7ea31ada.tar.bz2 | |
resolved conflicts for merge of d6c7dc4c to stage-aosp-master
Change-Id: I3341acd382e58d99d9a1b869878bb352e1ca8d56
Diffstat (limited to 'renderscript')
| -rwxr-xr-x | renderscript/lib/arm/libRSSupport.so | bin | 420320 -> 727312 bytes |
| -rwxr-xr-x | renderscript/lib/arm/libc.so | bin | 601616 -> 608553 bytes |
| -rwxr-xr-x | renderscript/lib/arm/libm.so | bin | 95504 -> 95552 bytes |
| -rwxr-xr-x | renderscript/lib/arm/librsjni.so | bin | 18560 -> 18560 bytes |
| -rw-r--r-- | renderscript/lib/arm/librsrt_arm.bc | bin | 237372 -> 235304 bytes |
| -rw-r--r-- | renderscript/lib/javalib.jar | bin | 146272 -> 146329 bytes |
| -rwxr-xr-x | renderscript/lib/mips/libRSSupport.so | bin | 583608 -> 944212 bytes |
| -rwxr-xr-x | renderscript/lib/mips/libc.so | bin | 930767 -> 1002124 bytes |
| -rwxr-xr-x | renderscript/lib/mips/libm.so | bin | 145140 -> 145172 bytes |
| -rwxr-xr-x | renderscript/lib/mips/librsjni.so | bin | 71924 -> 71924 bytes |
| -rw-r--r-- | renderscript/lib/mips/librsrt_mips.bc | bin | 237372 -> 235304 bytes |
| -rwxr-xr-x | renderscript/lib/x86/libRSSupport.so | bin | 518512 -> 911520 bytes |
| -rwxr-xr-x | renderscript/lib/x86/libc.so | bin | 995537 -> 981073 bytes |
| -rwxr-xr-x | renderscript/lib/x86/libm.so | bin | 132360 -> 124216 bytes |
| -rwxr-xr-x | renderscript/lib/x86/librsjni.so | bin | 26636 -> 26636 bytes |
| -rw-r--r-- | renderscript/lib/x86/librsrt_x86.bc | bin | 235392 -> 233328 bytes |
16 files changed, 0 insertions, 0 deletions
diff --git a/renderscript/lib/arm/libRSSupport.so b/renderscript/lib/arm/libRSSupport.so Binary files differindex 619f5d0..912ab7a 100755 --- a/renderscript/lib/arm/libRSSupport.so +++ b/renderscript/lib/arm/libRSSupport.so diff --git a/renderscript/lib/arm/libc.so b/renderscript/lib/arm/libc.so Binary files differindex 03c346e..b5ecd63 100755 --- a/renderscript/lib/arm/libc.so +++ b/renderscript/lib/arm/libc.so diff --git a/renderscript/lib/arm/libm.so b/renderscript/lib/arm/libm.so Binary files differindex 96b9091..6222def 100755 --- a/renderscript/lib/arm/libm.so +++ b/renderscript/lib/arm/libm.so diff --git a/renderscript/lib/arm/librsjni.so b/renderscript/lib/arm/librsjni.so Binary files differindex 4b578ee..528237f 100755 --- a/renderscript/lib/arm/librsjni.so +++ b/renderscript/lib/arm/librsjni.so diff --git a/renderscript/lib/arm/librsrt_arm.bc b/renderscript/lib/arm/librsrt_arm.bc Binary files differindex ddb5263..87197a6 100644 --- a/renderscript/lib/arm/librsrt_arm.bc +++ b/renderscript/lib/arm/librsrt_arm.bc diff --git a/renderscript/lib/javalib.jar b/renderscript/lib/javalib.jar Binary files differindex 2775a13..360b84e 100644 --- a/renderscript/lib/javalib.jar +++ b/renderscript/lib/javalib.jar diff --git a/renderscript/lib/mips/libRSSupport.so b/renderscript/lib/mips/libRSSupport.so Binary files differindex e59849f..49fdfa6 100755 --- a/renderscript/lib/mips/libRSSupport.so +++ b/renderscript/lib/mips/libRSSupport.so diff --git a/renderscript/lib/mips/libc.so b/renderscript/lib/mips/libc.so Binary files differindex c611d69..f33b5bb 100755 --- a/renderscript/lib/mips/libc.so +++ b/renderscript/lib/mips/libc.so diff --git a/renderscript/lib/mips/libm.so b/renderscript/lib/mips/libm.so Binary files differindex e07fe68..43019d1 100755 --- a/renderscript/lib/mips/libm.so +++ b/renderscript/lib/mips/libm.so diff --git a/renderscript/lib/mips/librsjni.so b/renderscript/lib/mips/librsjni.so Binary files differindex 99c8af7..cff13c1 100755 --- a/renderscript/lib/mips/librsjni.so +++ b/renderscript/lib/mips/librsjni.so diff --git a/renderscript/lib/mips/librsrt_mips.bc b/renderscript/lib/mips/librsrt_mips.bc Binary files differindex ddb5263..87197a6 100644 --- a/renderscript/lib/mips/librsrt_mips.bc +++ b/renderscript/lib/mips/librsrt_mips.bc diff --git a/renderscript/lib/x86/libRSSupport.so b/renderscript/lib/x86/libRSSupport.so Binary files differindex db3bfe4..58a6ba2 100755 --- a/renderscript/lib/x86/libRSSupport.so +++ b/renderscript/lib/x86/libRSSupport.so diff --git a/renderscript/lib/x86/libc.so b/renderscript/lib/x86/libc.so Binary files differindex 3f08c08..b2892bb 100755 --- a/renderscript/lib/x86/libc.so +++ b/renderscript/lib/x86/libc.so diff --git a/renderscript/lib/x86/libm.so b/renderscript/lib/x86/libm.so Binary files differindex 0ef13e2..1ba5696 100755 --- a/renderscript/lib/x86/libm.so +++ b/renderscript/lib/x86/libm.so diff --git a/renderscript/lib/x86/librsjni.so b/renderscript/lib/x86/librsjni.so Binary files differindex 31e8f35..943a4c0 100755 --- a/renderscript/lib/x86/librsjni.so +++ b/renderscript/lib/x86/librsjni.so diff --git a/renderscript/lib/x86/librsrt_x86.bc b/renderscript/lib/x86/librsrt_x86.bc Binary files differindex 649bc63..c6213bd 100644 --- a/renderscript/lib/x86/librsrt_x86.bc +++ b/renderscript/lib/x86/librsrt_x86.bc |