Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / frameworks / rs / a0450610cfb8167a8a0cd3b715085fb7d233b122
commita0450610cfb8167a8a0cd3b715085fb7d233b122[log] [tgz]
authorJean-Baptiste Queru <jbq@google.com>Fri Jul 02 07:46:21 2010 -0700
committerJean-Baptiste Queru <jbq@google.com>Fri Jul 02 07:46:21 2010 -0700
tree981c2a16598e7ab728c53f236a9ad8f30eb29cd3
parent4e9a7a8ded109e16b163789274899447cef02642 [diff]
parent9700d0a33c36d2dba232f20f852094113f252d5d [diff]
resolved conflicts for merge of f601ce2c to master

Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7
tree: 981c2a16598e7ab728c53f236a9ad8f30eb29cd3
  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. rsContextHostStub.h
  18. rsDevice.cpp
  19. rsDevice.h
  20. rsElement.cpp
  21. rsElement.h
  22. rsFileA3D.cpp
  23. rsFileA3D.h
  24. rsFont.cpp
  25. rsFont.h
  26. rsg_generator.c
  27. rsg_ScriptJavaClass.cpp
  28. rsgApi.cpp.rsg
  29. rsgApiFuncDecl.h.rsg
  30. rsgApiReplay.cpp.rsg
  31. rsgApiStructs.h.rsg
  32. rsHandcode.h
  33. rsLight.cpp
  34. rsLight.h
  35. rsLocklessFifo.cpp
  36. rsLocklessFifo.h
  37. rsMatrix.cpp
  38. rsMatrix.h
  39. rsMesh.cpp
  40. rsMesh.h
  41. rsMutex.cpp
  42. rsMutex.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. rsScriptC_LibCL.cpp
  63. rsScriptC_LibGL.cpp
  64. rsShaderCache.cpp
  65. rsShaderCache.h
  66. rsSignal.cpp
  67. rsSignal.h
  68. rsStream.cpp
  69. rsStream.h
  70. rsThreadIO.cpp
  71. rsThreadIO.h
  72. rsType.cpp
  73. rsType.h
  74. rsUtils.h
  75. rsVertexArray.cpp
  76. rsVertexArray.h
  77. ScriptC_Modelviewer.java
  78. spec.h
  79. spec.l