Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / 56456fa1d368412386e03d72d63354befdc85e66
commit56456fa1d368412386e03d72d63354befdc85e66[log] [tgz]
authorDavid 'Digit' Turner <digit@google.com>Wed Jul 13 14:55:20 2011 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Wed Jul 13 14:55:20 2011 -0700
tree266058c881c2af2b88a2094d6b3ce494e8706af7
parentcc24af6ed02e23d1483097add12d0f20944e7492 [diff]
parentcad86a311f295384ee1ef9d6a03e809389276b14 [diff]
am 0814a9aa: am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp

* commit '0814a9aa0c8f89f084ba37df05b3735274d78420':
  NativeDaemonConnector: Fix SDCard mounting bug in the emulator.
  Fix missing NL
tree: 266058c881c2af2b88a2094d6b3ce494e8706af7
  1. driver/
  2. scriptc/
  3. Android.mk
  4. RenderScript.h
  5. RenderScriptDefines.h
  6. RenderScriptEnv.h
  7. rs.spec
  8. rs_hal.h
  9. rsAdapter.cpp
  10. rsAdapter.h
  11. rsAllocation.cpp
  12. rsAllocation.h
  13. rsAnimation.cpp
  14. rsAnimation.h
  15. rsComponent.cpp
  16. rsComponent.h
  17. rsContext.cpp
  18. rsContext.h
  19. rsDevice.cpp
  20. rsDevice.h
  21. rsElement.cpp
  22. rsElement.h
  23. rsFBOCache.cpp
  24. rsFBOCache.h
  25. rsFifo.cpp
  26. rsFifo.h
  27. rsFifoSocket.cpp
  28. rsFifoSocket.h
  29. rsFileA3D.cpp
  30. rsFileA3D.h
  31. rsFont.cpp
  32. rsFont.h
  33. rsg_generator.c
  34. rsgApi.cpp.rsg
  35. rsgApiFuncDecl.h.rsg
  36. rsgApiReplay.cpp.rsg
  37. rsgApiStructs.h.rsg
  38. rsLocklessFifo.cpp
  39. rsLocklessFifo.h
  40. rsMatrix2x2.cpp
  41. rsMatrix2x2.h
  42. rsMatrix3x3.cpp
  43. rsMatrix3x3.h
  44. rsMatrix4x4.cpp
  45. rsMatrix4x4.h
  46. rsMesh.cpp
  47. rsMesh.h
  48. rsMutex.cpp
  49. rsMutex.h
  50. rsObjectBase.cpp
  51. rsObjectBase.h
  52. rsProgram.cpp
  53. rsProgram.h
  54. rsProgramBase.h
  55. rsProgramFragment.cpp
  56. rsProgramFragment.h
  57. rsProgramRaster.cpp
  58. rsProgramRaster.h
  59. rsProgramStore.cpp
  60. rsProgramStore.h
  61. rsProgramVertex.cpp
  62. rsProgramVertex.h
  63. rsRuntime.h
  64. rsSampler.cpp
  65. rsSampler.h
  66. rsScript.cpp
  67. rsScript.h
  68. rsScriptC.cpp
  69. rsScriptC.h
  70. rsScriptC_Lib.cpp
  71. rsScriptC_LibGL.cpp
  72. rsSignal.cpp
  73. rsSignal.h
  74. rsStream.cpp
  75. rsStream.h
  76. rsThreadIO.cpp
  77. rsThreadIO.h
  78. rsType.cpp
  79. rsType.h
  80. rsUtils.h
  81. spec.h
  82. spec.l