Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / rs / cad86a311f295384ee1ef9d6a03e809389276b14
commitcad86a311f295384ee1ef9d6a03e809389276b14[log] [tgz]
authorDavid 'Digit' Turner <digit@google.com>Mon Jul 11 16:15:27 2011 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Jul 11 16:15:27 2011 -0700
tree2cb8a21430ad99978a2b62cdbf95156c16b643d3
parent440830581edb1ed2f238c5af5d012dc2a6aada88 [diff]
parent163b9ff7d1014898fd346db9c9378ede4f375f19 [diff]
am db4c5f35: resolved conflicts for merge of 7816eded to gingerbread-plus-aosp

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