Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 79dc7ca828a00ae82ab2aa845a67778796d00b86
commit79dc7ca828a00ae82ab2aa845a67778796d00b86[log] [tgz]
authorNick Kralevich <nnk@google.com>Fri May 14 15:49:42 2010 -0700
committerNick Kralevich <nnk@google.com>Fri May 14 15:49:42 2010 -0700
tree2c1116968ecb427bf750ac5367d917c3d4eacd72
parentccc010bb7c0f89e162bf60033968a20be90a903a [diff]
parent8492a70e1265925903c5e2389fd1d185d82c7047 [diff]
resolved conflicts for merge of cbf26fd3 to master

Change-Id: I1feb7266c1d5cdebbfb8b8fa0d87d986953a20b6
tree: 2c1116968ecb427bf750ac5367d917c3d4eacd72
  1. java/
  2. scriptc/
  3. Android.mk
  4. RenderScript.h
  5. RenderScriptEnv.h
  6. rs.spec
  7. rsAdapter.cpp
  8. rsAdapter.h
  9. rsAllocation.cpp
  10. rsAllocation.h
  11. rsAnimation.cpp
  12. rsAnimation.h
  13. rsComponent.cpp
  14. rsComponent.h
  15. rsContext.cpp
  16. rsContext.h
  17. rsDevice.cpp
  18. rsDevice.h
  19. rsElement.cpp
  20. rsElement.h
  21. rsFileA3D.cpp
  22. rsFileA3D.h
  23. rsFileA3DDecls.h
  24. rsg_generator.c
  25. rsg_ScriptJavaClass.cpp
  26. rsgApi.cpp.rsg
  27. rsgApiFuncDecl.h.rsg
  28. rsgApiReplay.cpp.rsg
  29. rsgApiStructs.h.rsg
  30. rsHandcode.h
  31. rsLight.cpp
  32. rsLight.h
  33. rsLocklessFifo.cpp
  34. rsLocklessFifo.h
  35. rsMatrix.cpp
  36. rsMatrix.h
  37. rsMesh.cpp
  38. rsMesh.h
  39. rsMutex.cpp
  40. rsMutex.h
  41. rsNoise.cpp
  42. rsNoise.h
  43. rsObjectBase.cpp
  44. rsObjectBase.h
  45. rsProgram.cpp
  46. rsProgram.h
  47. rsProgramFragment.cpp
  48. rsProgramFragment.h
  49. rsProgramRaster.cpp
  50. rsProgramRaster.h
  51. rsProgramStore.cpp
  52. rsProgramStore.h
  53. rsProgramVertex.cpp
  54. rsProgramVertex.h
  55. rsSampler.cpp
  56. rsSampler.h
  57. rsScript.cpp
  58. rsScript.h
  59. rsScriptC.cpp
  60. rsScriptC.h
  61. rsScriptC_Lib.cpp
  62. rsShaderCache.cpp
  63. rsShaderCache.h
  64. rsSignal.cpp
  65. rsSignal.h
  66. rsSimpleMesh.cpp
  67. rsSimpleMesh.h
  68. rsThreadIO.cpp
  69. rsThreadIO.h
  70. rsType.cpp
  71. rsType.h
  72. rsUtils.h
  73. rsVertexArray.cpp
  74. rsVertexArray.h
  75. spec.h
  76. spec.l